Skip to content

Commit e5e48a0

Browse files
authored
Merge pull request #1050 from NativeScript/trifonov/bcel-update
Update bcel dependency which caused issues with Java 8
2 parents 0329c36 + 57f447c commit e5e48a0

File tree

6 files changed

+10
-11
lines changed

6 files changed

+10
-11
lines changed

test-app/build-tools/android-metadata-generator/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
*/
88
apply plugin: "java"
99

10-
sourceCompatibility = 1.6
11-
targetCompatibility = 1.6
10+
sourceCompatibility = JavaVersion.VERSION_1_6
11+
targetCompatibility = JavaVersion.VERSION_1_6
1212

1313
buildscript {
1414
repositories {
@@ -36,7 +36,7 @@ compileJava {
3636
compileJava.outputs.dir("$rootDir/dist/classes")
3737

3838
dependencies {
39-
compile files("./src/libs/bcel-5.2.jar")
39+
compile 'org.apache.bcel:bcel:6.0'
4040
compile files("./src/libs/dx.jar")
4141
}
4242

test-app/build-tools/android-metadata-generator/src/.classpath

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
<classpath>
33
<classpathentry kind="src" path="src"/>
44
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
5-
<classpathentry kind="lib" path="libs/bcel-5.2.jar"/>
65
<classpathentry kind="output" path="bin"/>
76
</classpath>
-521 KB
Binary file not shown.

test-app/build-tools/static-binding-generator/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
apply plugin: 'java-library'
22

3+
sourceCompatibility = JavaVersion.VERSION_1_7
4+
targetCompatibility = JavaVersion.VERSION_1_7
5+
36
dependencies {
4-
compile 'org.apache.bcel:bcel:5.2'
7+
compile 'org.apache.bcel:bcel:6.0'
58
compile group: 'org.json', name: 'json', version: '20090211'
69
compile 'commons-io:commons-io:2.5'
710
testCompile 'junit:junit:4.+'
811
}
912

10-
sourceCompatibility = "1.7"
11-
targetCompatibility = "1.7"
12-
1313
compileJava {
1414
options.compilerArgs << "-Xlint:all" << "-Xlint:-options" << "-Werror"
1515
}

test-app/build-tools/static-binding-generator/runtests.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ repositories {
99
}
1010

1111
dependencies {
12-
compile 'org.apache.bcel:bcel:5.2'
12+
compile 'org.apache.bcel:bcel:6.0'
1313
compile group: 'org.json', name: 'json', version: '20090211'
1414
compile 'commons-io:commons-io:2.5'
1515
}

test-app/runtime-binding-generator/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ dependencies {
44
testCompile 'junit:junit:4.+'
55
}
66

7-
sourceCompatibility = "1.7"
8-
targetCompatibility = "1.7"
7+
sourceCompatibility = JavaVersion.VERSION_1_7
8+
targetCompatibility = JavaVersion.VERSION_1_7

0 commit comments

Comments
 (0)