Skip to content

Commit e22f55f

Browse files
barancevbarancev
committed
[java] Extracting build tools into a separate source subtree and a separate IDEA module to set different source levels for the build tools (11) and the main code (8)
1 parent 0eabe11 commit e22f55f

26 files changed

Lines changed: 72 additions & 52 deletions

File tree

‎.idea/modules.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎java/buildtools/buildtools.iml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" inherit-compiler-output="true">
4+
<exclude-output />
5+
<content url="file://$MODULE_DIR$">
6+
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
7+
</content>
8+
<orderEntry type="inheritedJdk" />
9+
<orderEntry type="sourceFolder" forTests="false" />
10+
<orderEntry type="module" module-name="java" />
11+
<orderEntry type="library" name="maven" level="project" />
12+
</component>
13+
</module>

java/client/src/org/openqa/selenium/tools/jar/BUILD.bazel renamed to java/buildtools/src/dev/selenium/tools/jar/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ java_binary(
99
"-target",
1010
"11",
1111
],
12+
main_class = "dev.selenium.tools.jar.MergeJars",
1213
visibility = [
1314
"//visibility:public",
1415
],

java/client/src/org/openqa/selenium/tools/jar/MergeJars.java renamed to java/buildtools/src/dev/selenium/tools/jar/MergeJars.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
package org.openqa.selenium.tools.jar;
18+
package dev.selenium.tools.jar;
1919

2020
import java.io.ByteArrayOutputStream;
2121
import java.io.File;

java/client/src/org/openqa/selenium/tools/javadoc/BUILD.bazel renamed to java/buildtools/src/dev/selenium/tools/javadoc/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ java_binary(
99
"-target",
1010
"11",
1111
],
12-
main_class = "org.openqa.selenium.tools.javadoc.JavadocJarMaker",
12+
main_class = "dev.selenium.tools.javadoc.JavadocJarMaker",
1313
visibility = [
1414
"//visibility:public",
1515
],
1616
deps = [
1717
"//java/client/src/org/openqa/selenium/io",
18-
"//java/client/src/org/openqa/selenium/tools/zip",
18+
"//java/buildtools/src/dev/selenium/tools/zip",
1919
],
2020
)

java/client/src/org/openqa/selenium/tools/javadoc/JavadocJarMaker.java renamed to java/buildtools/src/dev/selenium/tools/javadoc/JavadocJarMaker.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
package org.openqa.selenium.tools.javadoc;
18+
package dev.selenium.tools.javadoc;
1919

2020
import org.openqa.selenium.io.TemporaryFilesystem;
21-
import org.openqa.selenium.tools.zip.StableZipEntry;
21+
import dev.selenium.tools.zip.StableZipEntry;
2222

2323
import javax.tools.DocumentationTool;
2424
import javax.tools.JavaFileObject;

java/client/src/org/openqa/selenium/tools/maven/BUILD.bazel renamed to java/buildtools/src/dev/selenium/tools/maven/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ java_binary(
1010
"-target",
1111
"11",
1212
],
13-
main_class = "org.openqa.selenium.tools.maven.MavenPublisher",
13+
main_class = "dev.selenium.tools.maven.MavenPublisher",
1414
visibility = ["//visibility:public"],
1515
deps = [
1616
"//java/client/src/org/openqa/selenium/remote",

java/client/src/org/openqa/selenium/tools/maven/MavenPublisher.java renamed to java/buildtools/src/dev/selenium/tools/maven/MavenPublisher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
package org.openqa.selenium.tools.maven;
18+
package dev.selenium.tools.maven;
1919

2020
import com.google.common.base.Splitter;
2121
import com.google.common.hash.Hashing;

java/client/src/org/openqa/selenium/tools/modules/BUILD.bazel renamed to java/buildtools/src/dev/selenium/tools/modules/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ java_binary(
1010
"-target",
1111
"11",
1212
],
13-
main_class = "org.openqa.selenium.tools.modules.ModuleGenerator",
13+
main_class = "dev.selenium.tools.modules.ModuleGenerator",
1414
visibility = ["//visibility:public"],
1515
deps = [
1616
"//java/client/src/org/openqa/selenium/io",
17-
"//java/client/src/org/openqa/selenium/tools/zip",
17+
"//java/buildtools/src/dev/selenium/tools/zip",
1818
artifact("net.bytebuddy:byte-buddy"),
1919
artifact("com.github.javaparser:javaparser-core"),
2020
],

java/client/src/org/openqa/selenium/tools/modules/ModuleGenerator.java renamed to java/buildtools/src/dev/selenium/tools/modules/ModuleGenerator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
package org.openqa.selenium.tools.modules;
18+
package dev.selenium.tools.modules;
1919

2020
import com.github.javaparser.JavaParser;
2121
import com.github.javaparser.ParseResult;
@@ -37,7 +37,7 @@
3737
import net.bytebuddy.jar.asm.ModuleVisitor;
3838

3939
import org.openqa.selenium.io.TemporaryFilesystem;
40-
import org.openqa.selenium.tools.zip.StableZipEntry;
40+
import dev.selenium.tools.zip.StableZipEntry;
4141

4242
import java.io.ByteArrayOutputStream;
4343
import java.io.File;

0 commit comments

Comments
 (0)