jessikitty/jadx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

build: update gradle and dependencies

Browse Source
This commit is contained in:
Skylot
2019-06-20 18:54:58 +03:00
parent 29a137bde3
commit 436e86fdf2
9 changed files with 68 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+5 -8
View File
@@ -1,9 +1,9 @@
import com.diffplug.spotless.LineEnding
plugins {
id 'org.sonarqube' version '2.7'
id 'org.sonarqube' version '2.7.1'
id 'com.github.ben-manes.versions' version '0.21.0'
id "com.diffplug.gradle.spotless" version "3.21.1"
id "com.diffplug.gradle.spotless" version "3.23.1"
}
ext.jadxVersion = System.getenv('JADX_VERSION') ?: "dev"
@@ -18,9 +18,6 @@ allprojects {
version = jadxVersion
tasks.withType(JavaCompile) {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
if (!"$it".contains(':jadx-samples:')) {
options.compilerArgs << '-Xlint' << '-Xlint:unchecked' << '-Xlint:deprecation'
}
@@ -42,10 +39,10 @@ allprojects {
testCompile 'ch.qos.logback:logback-classic:1.2.3'
testCompile 'org.hamcrest:hamcrest-library:2.1'
testCompile 'org.mockito:mockito-core:2.25.1'
testCompile 'org.mockito:mockito-core:2.28.2'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.4.1'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.4.1'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.4.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.4.2'
testCompile 'org.eclipse.jdt.core.compiler:ecj:4.6.1'
}
gradle/wrapper/gradle-wrapper.jar
Vendored
BIN
View File
Binary file not shown.
gradle/wrapper/gradle-wrapper.properties
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
gradlew
Vendored
+17 -1
View File
@@ -1,5 +1,21 @@
#!/usr/bin/env sh
#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
##############################################################################
##
## Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
gradlew.bat
Vendored
+17 -1
View File
@@ -1,3 +1,19 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem http://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@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=
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
jadx-cli/build.gradle
+9 -12
View File
@@ -1,7 +1,6 @@
apply plugin: 'application'
mainClassName = 'jadx.cli.JadxCLI'
applicationName = 'jadx'
plugins {
id 'application'
}
dependencies {
compile(project(':jadx-core'))
@@ -9,6 +8,12 @@ dependencies {
compile 'ch.qos.logback:logback-classic:1.2.3'
}
application {
applicationName = 'jadx'
mainClassName = 'jadx.cli.JadxCLI'
applicationDefaultJvmArgs = ['-Xms128M', '-Xmx4g', '-XX:+UseG1GC']
}
applicationDistribution.with {
into('') {
from '../.'
@@ -17,11 +22,3 @@ applicationDistribution.with {
include 'LICENSE'
}
}
startScripts {
defaultJvmOpts = ['-Xms128M', '-Xmx4g', '-XX:+UseG1GC']
doLast {
def str = windowsScript.text
windowsScript.text = str
}
}
jadx-core/build.gradle
+3 -3
View File
@@ -3,7 +3,7 @@ ext.jadxClasspath = 'clsp-data/android-5.1.jar'
dependencies {
runtime files(jadxClasspath)
compile files('lib/dx-1.16.jar')
compile files('lib/dx-1.16.jar') // TODO: dx don't support java version > 9 (53)
compile 'org.ow2.asm:asm:7.1'
compile 'org.jetbrains:annotations:17.0.0'
@@ -14,7 +14,7 @@ dependencies {
compile('org.smali:smali:2.2.7') {
exclude group: 'com.google.guava'
}
compile 'com.google.guava:guava:27.1-jre'
compile 'com.google.guava:guava:28.0-jre'
testCompile 'org.apache.commons:commons-lang3:3.8.1'
testCompile 'org.apache.commons:commons-lang3:3.9'
}
jadx-gui/build.gradle
+13 -13
View File
@@ -1,29 +1,28 @@
plugins {
id 'edu.sc.seis.launch4j' version '2.4.5'
id 'application'
id 'edu.sc.seis.launch4j' version '2.4.6'
id 'com.github.johnrengelman.shadow' version '5.0.0'
}
apply plugin: 'application'
mainClassName = 'jadx.gui.JadxGUI'
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
dependencies {
compile(project(":jadx-core"))
compile(project(":jadx-cli"))
compile 'com.fifesoft:rsyntaxtextarea:3.0.2'
compile 'com.fifesoft:rsyntaxtextarea:3.0.3'
compile files('libs/jfontchooser-1.0.5.jar')
compile 'hu.kazocsaba:image-viewer:1.2.3'
compile 'org.apache.commons:commons-lang3:3.8.1'
compile 'org.apache.commons:commons-lang3:3.9'
compile 'org.apache.commons:commons-text:1.6'
compile 'io.reactivex.rxjava2:rxjava:2.2.7'
compile "com.github.akarnokd:rxjava2-swing:0.3.4"
compile 'com.android.tools.build:apksig:3.3.2'
compile 'io.reactivex.rxjava2:rxjava:2.2.10'
compile "com.github.akarnokd:rxjava2-swing:0.3.7"
compile 'com.android.tools.build:apksig:3.4.1'
}
application {
applicationName = 'jadx-gui'
mainClassName = 'jadx.gui.JadxGUI'
}
applicationDistribution.with {
@@ -70,6 +69,7 @@ launch4j {
initialHeapPercent = 5
maxHeapSize = 4096
maxHeapPercent = 70
downloadUrl = 'https://adoptopenjdk.net/releases.html?variant=openjdk11&jvmVariant=hotspot#x64_win'
}
test {
jadx-samples/build.gradle
+3
View File
@@ -11,6 +11,9 @@ dependencies {
compileJava {
options.compilerArgs << '-g:none'
if (JavaVersion.current() > JavaVersion.VERSION_1_8) {
options.compilerArgs.addAll('--release 8'.split(' '))
}
}
task samplesRun(type: JavaExec, dependsOn: compileJava) {