Skip to content

Update bcel dependency which caused issues with Java 8 #1050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 10, 2018
Merged

Update bcel dependency which caused issues with Java 8 #1050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc921d1
updated bcel to 6.0
vtrifonov May 10, 2018
65b83a1
updated bcel to 6.0
vtrifonov May 10, 2018
57f447c
Merge branch 'trifonov/bcel-update' of https://github.com/NativeScrip…
vtrifonov May 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions test-app/build-tools/android-metadata-generator/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
*/
apply plugin: "java"

sourceCompatibility = 1.6
targetCompatibility = 1.6
sourceCompatibility = JavaVersion.VERSION_1_6
targetCompatibility = JavaVersion.VERSION_1_6

buildscript {
repositories {
Expand Down Expand Up @@ -36,7 +36,7 @@ compileJava {
compileJava.outputs.dir("$rootDir/dist/classes")

dependencies {
compile files("./src/libs/bcel-5.2.jar")
compile 'org.apache.bcel:bcel:6.0'
compile files("./src/libs/dx.jar")
}

Expand Down
1 change: 0 additions & 1 deletion test-app/build-tools/android-metadata-generator/src/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="libs/bcel-5.2.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Binary file removed test-app/build-tools/android-metadata-generator/src/libs/bcel-5.2.jar
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions test-app/build-tools/static-binding-generator/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
apply plugin: 'java-library'

sourceCompatibility = JavaVersion.VERSION_1_7
targetCompatibility = JavaVersion.VERSION_1_7

dependencies {
compile 'org.apache.bcel:bcel:5.2'
compile 'org.apache.bcel:bcel:6.0'
compile group: 'org.json', name: 'json', version: '20090211'
compile 'commons-io:commons-io:2.5'
testCompile 'junit:junit:4.+'
}

sourceCompatibility = "1.7"
targetCompatibility = "1.7"

compileJava {
options.compilerArgs << "-Xlint:all" << "-Xlint:-options" << "-Werror"
}
Expand Down
2 changes: 1 addition & 1 deletion test-app/build-tools/static-binding-generator/runtests.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repositories {
}

dependencies {
compile 'org.apache.bcel:bcel:5.2'
compile 'org.apache.bcel:bcel:6.0'
compile group: 'org.json', name: 'json', version: '20090211'
compile 'commons-io:commons-io:2.5'
}
Expand Down
4 changes: 2 additions & 2 deletions test-app/runtime-binding-generator/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ dependencies {
testCompile 'junit:junit:4.+'
}

sourceCompatibility = "1.7"
targetCompatibility = "1.7"
sourceCompatibility = JavaVersion.VERSION_1_7
targetCompatibility = JavaVersion.VERSION_1_7