Skip to content

Commit

Permalink
chore: update gradle and dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
skylot committed Apr 20, 2023
1 parent 9417671 commit b763402
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 15 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ allprojects {
implementation 'org.slf4j:slf4j-api:2.0.7'
compileOnly 'org.jetbrains:annotations:24.0.1'

testImplementation 'ch.qos.logback:logback-classic:1.4.6'
testImplementation 'ch.qos.logback:logback-classic:1.4.7'
testImplementation 'org.hamcrest:hamcrest-library:2.2'
testImplementation 'org.mockito:mockito-core:5.2.0'
testImplementation 'org.mockito:mockito-core:5.3.0'
testImplementation 'org.assertj:assertj-core:3.24.2'

testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
distributionSha256Sum=a62c5f99585dd9e1f95dab7b9415a0e698fa9dd1e6c38537faa81ac078f4d23e
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
7 changes: 4 additions & 3 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,6 @@ done
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

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

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum

Expand Down Expand Up @@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
done
fi


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

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
Expand Down
2 changes: 1 addition & 1 deletion jadx-cli/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies {
runtimeOnly(project(':jadx-plugins:jadx-script:jadx-script-plugin'))

implementation 'com.beust:jcommander:1.82'
implementation 'ch.qos.logback:logback-classic:1.4.6'
implementation 'ch.qos.logback:logback-classic:1.4.7'
}

application {
Expand Down
4 changes: 2 additions & 2 deletions jadx-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ dependencies {
implementation 'com.google.code.gson:gson:2.10.1'

// TODO: move resources decoding to separate plugin module
implementation 'com.android.tools.build:aapt2-proto:7.4.2-8841542'
implementation 'com.google.protobuf:protobuf-java:3.22.2' // forcing latest version
implementation 'com.android.tools.build:aapt2-proto:8.0.0-9289358'
implementation 'com.google.protobuf:protobuf-java:3.22.3' // forcing latest version

testImplementation 'org.apache.commons:commons-lang3:3.12.0'

Expand Down
10 changes: 5 additions & 5 deletions jadx-gui/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ dependencies {
implementation 'com.pinterest.ktlint:ktlint-ruleset-standard:0.48.2'

implementation 'com.beust:jcommander:1.82'
implementation 'ch.qos.logback:logback-classic:1.4.6'
implementation 'ch.qos.logback:logback-classic:1.4.7'
implementation 'dev.dirs:directories:26'

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

implementation 'com.formdev:flatlaf:3.1'
implementation 'com.formdev:flatlaf-intellij-themes:3.1'
implementation 'com.formdev:flatlaf-extras:3.1'
implementation 'com.formdev:flatlaf:3.1.1'
implementation 'com.formdev:flatlaf-intellij-themes:3.1.1'
implementation 'com.formdev:flatlaf-extras:3.1.1'
implementation 'com.formdev:svgSalamander:1.1.4'

implementation 'com.google.code.gson:gson:2.10.1'
Expand All @@ -41,7 +41,7 @@ dependencies {

implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
implementation "com.github.akarnokd:rxjava2-swing:0.3.7"
implementation 'com.android.tools.build:apksig:7.4.2'
implementation 'com.android.tools.build:apksig:8.0.0'
implementation 'io.github.skylot:jdwp:2.0.0'

testImplementation project(":jadx-core").sourceSets.test.output
Expand Down

0 comments on commit b763402

Please sign in to comment.