Skip to content

Commit da8fde2

Browse files
chore: switch to javac compiler (#1556)
1 parent f1cc103 commit da8fde2

File tree

3 files changed

+6
-52
lines changed

3 files changed

+6
-52
lines changed

build.gradle

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import org.apache.tools.ant.filters.*
33
plugins {
44
id 'java-library'
55
id 'idea'
6-
id 'maven-publish'
76
id 'eclipse'
7+
id 'maven-publish'
88
id 'jacoco'
99
id 'checkstyle'
1010
id 'signing'
@@ -16,42 +16,17 @@ repositories {
1616
mavenCentral()
1717
}
1818

19-
configurations {
20-
ecj
21-
lombok
22-
}
23-
24-
dependencies {
25-
ecj 'org.eclipse.jdt:ecj:3.26.0'
26-
lombok 'org.projectlombok:lombok:1.18.22'
27-
}
28-
2919
java {
3020
sourceCompatibility = JavaVersion.VERSION_1_8
3121
targetCompatibility = JavaVersion.VERSION_1_8
3222
withJavadocJar()
3323
withSourcesJar()
3424
}
3525

36-
compileJava {
37-
def ecjJar = configurations.ecj.singleFile
38-
def lombokjar = configurations.lombok.singleFile
39-
40-
options.fork = true
41-
options.fork executable: 'java', jvmArgs: [ '-javaagent:'+lombokjar.path+'=ECJ', '-jar', ecjJar.path, '-cp', lombokjar.path]
42-
options.define compilerArgs: [
43-
'-encoding', 'utf-8',
44-
// https://www.ibm.com/support/knowledgecenter/SS8PJ7_9.7.0/org.eclipse.jdt.doc.user/tasks/task-using_batch_compiler.htm
45-
'-warn:-unused,-unchecked,-raw,-serial,-suppress',
46-
]
47-
48-
// https://github.com/gradle/gradle/issues/12904
49-
options.headerOutputDirectory.convention(null)
50-
}
51-
5226
dependencies {
53-
compileOnly('org.projectlombok:lombok:1.18.22')
54-
annotationProcessor('org.projectlombok:lombok:1.18.20')
27+
compileOnly 'org.projectlombok:lombok:1.18.22'
28+
annotationProcessor 'org.projectlombok:lombok:1.18.22'
29+
5530
api ("org.seleniumhq.selenium:selenium-java") {
5631
version {
5732
strictly "${project.property('selenium.version')}"

docs/Note-for-developers.md

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,7 @@ This is the Gradle project.
1212

1313
Be sure that:
1414

15-
- The `JAVA_HOME` environmental contains a path to JDK > 7
16-
17-
- If non built-in gradle distribution is used then its version should be > 2.1
18-
19-
## Compiler
20-
21-
This project is compiled in some not common way. We use `ecj` Eclipse Java Compiler. Below is the sample how to define this compiler by IDE.
22-
![eclipse compiler](https://cloud.githubusercontent.com/assets/4927589/14228367/6fce184e-f91b-11e5-837c-2673446d24ea.png)
23-
24-
## JDK
25-
26-
Please check following settings:
27-
28-
![](https://cloud.githubusercontent.com/assets/4927589/18324490/7ffd3ba4-7545-11e6-9f22-eb028737283c.png)
29-
30-
![](https://cloud.githubusercontent.com/assets/4927589/18324593/f5254e3a-7545-11e6-85c5-e4c491ee268d.png)
31-
32-
![](https://cloud.githubusercontent.com/assets/4927589/18324648/3f4635a6-7546-11e6-966c-2949059968ac.png)
33-
34-
![](https://cloud.githubusercontent.com/assets/4927589/18324760/cbca4aee-7546-11e6-8cfb-e86d8018be6a.png)
35-
36-
![](https://cloud.githubusercontent.com/assets/4927589/18324835/2e3bfc04-7547-11e6-8f5e-981aea8f1771.png)
15+
- The `JAVA_HOME` environmental contains a path to JDK 1.8+
3716

3817
## Coding Standards
3918

src/main/java/io/appium/java_client/remote/AppiumCommandExecutor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ private Response createSession(Command command) throws IOException {
161161
}
162162

163163
public void refreshAdditionalCommands() {
164-
getAdditionalCommands().forEach(super::defineCommand);
164+
getAdditionalCommands().forEach(this::defineCommand);
165165
}
166166

167167
@Override

0 commit comments

Comments
 (0)