Skip to content

Commit

Permalink
build: update gradle and dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
skylot committed May 3, 2020
1 parent 258ecad commit 2dce1c0
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 13 deletions.
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'org.sonarqube' version '2.8'
id 'com.github.ben-manes.versions' version '0.27.0'
id "com.diffplug.gradle.spotless" version "3.27.1"
id 'com.github.ben-manes.versions' version '0.28.0'
id "com.diffplug.gradle.spotless" version "3.28.1"
}

ext.jadxVersion = System.getenv('JADX_VERSION') ?: "dev"
Expand Down Expand Up @@ -37,11 +37,11 @@ allprojects {

testCompile 'ch.qos.logback:logback-classic:1.2.3'
testCompile 'org.hamcrest:hamcrest-library:2.2'
testCompile 'org.mockito:mockito-core:3.2.4'
testCompile 'org.mockito:mockito-core:3.3.3'
testCompile 'org.assertj:assertj-core:3.15.0'

testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.6.0'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.6.2'

testCompile 'org.eclipse.jdt.core.compiler:ecj:4.6.1'
}
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
3 changes: 3 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

Expand Down
6 changes: 3 additions & 3 deletions jadx-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ dependencies {

compile files('lib/dx-1.16.jar') // TODO: dx don't support java version > 9 (53)

compile 'org.ow2.asm:asm:7.3.1'
compile 'org.jetbrains:annotations:18.0.0'
compile 'org.ow2.asm:asm:8.0.1'
compile 'org.jetbrains:annotations:19.0.0'
compile 'com.google.code.gson:gson:2.8.6'

compile 'org.smali:baksmali:2.4.0'
compile('org.smali:smali:2.4.0') {
exclude group: 'com.google.guava'
}
compile 'com.google.guava:guava:28.2-jre'
compile 'com.google.guava:guava:29.0-jre'

testCompile 'org.apache.commons:commons-lang3:3.9'
}
8 changes: 4 additions & 4 deletions jadx-gui/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ dependencies {
compile(project(":jadx-core"))
compile(project(":jadx-cli"))

compile 'com.fifesoft:rsyntaxtextarea:3.0.8'
compile 'com.fifesoft:rsyntaxtextarea:3.1.1'
compile files('libs/jfontchooser-1.0.5.jar')
compile 'hu.kazocsaba:image-viewer:1.2.3'

compile 'org.apache.commons:commons-lang3:3.9'
compile 'org.apache.commons:commons-lang3:3.10'
compile 'org.apache.commons:commons-text:1.8'

compile 'io.reactivex.rxjava2:rxjava:2.2.17'
compile 'io.reactivex.rxjava2:rxjava:2.2.19'
compile "com.github.akarnokd:rxjava2-swing:0.3.7"
compile 'com.android.tools.build:apksig:3.5.3'
compile 'com.android.tools.build:apksig:3.6.3'
}

application {
Expand Down

0 comments on commit 2dce1c0

Please sign in to comment.