build: migrate to kotlin dsl in gradle scripts, update gradle and deps

This commit is contained in:
Skylot
2023-07-07 22:55:45 +01:00
parent 3e4c6a9c51
commit d076c4e73d
32 changed files with 623 additions and 595 deletions
-20
View File
@@ -1,20 +0,0 @@
plugins {
id 'jadx-library'
}
dependencies {
api(project(":jadx-core"))
// TODO: finish own smali printer
implementation 'org.smali:baksmali:2.5.2'
// force latest version for smali
constraints {
implementation 'com.google.guava:guava:30.1.1-jre'
implementation 'com.beust:jcommander:1.81'
}
// compile smali files in tests
testImplementation('org.smali:smali:2.5.2') {
exclude(group: 'junit', module: 'junit') // ignore junit 4 transitive dependency
}
}
@@ -0,0 +1,20 @@
plugins {
id("jadx-library")
}
dependencies {
api(project(":jadx-core"))
// TODO: finish own smali printer
implementation("org.smali:baksmali:2.5.2")
// force latest version for smali
constraints {
implementation("com.google.guava:guava:30.1.1-jre")
implementation("com.beust:jcommander:1.81")
}
// compile smali files in tests
testImplementation("org.smali:smali:2.5.2") {
exclude(group = "junit", module = "junit") // ignore junit 4 transitive dependency
}
}
-3
View File
@@ -1,3 +0,0 @@
plugins {
id 'jadx-library'
}
@@ -0,0 +1,3 @@
plugins {
id("jadx-library")
}
@@ -1,13 +0,0 @@
plugins {
id 'jadx-library'
}
dependencies {
api(project(":jadx-core"))
implementation(project(":jadx-plugins:jadx-dex-input"))
implementation('com.jakewharton.android.repackaged:dalvik-dx:11.0.0_r3')
implementation('com.android.tools:r8:8.0.40')
implementation 'org.ow2.asm:asm:9.5'
}
@@ -0,0 +1,13 @@
plugins {
id("jadx-library")
}
dependencies {
api(project(":jadx-core"))
implementation(project(":jadx-plugins:jadx-dex-input"))
implementation("com.jakewharton.android.repackaged:dalvik-dx:11.0.0_r3")
implementation("com.android.tools:r8:8.0.40")
implementation("org.ow2.asm:asm:9.5")
}
@@ -1,12 +1,12 @@
plugins {
id 'jadx-library'
id("jadx-library")
}
dependencies {
api(project(":jadx-core"))
// show bytecode disassemble
implementation 'io.github.skylot:raung-disasm:0.1.0'
implementation("io.github.skylot:raung-disasm:0.1.0")
testImplementation(project(":jadx-core"))
}
@@ -1,5 +1,5 @@
plugins {
id 'jadx-library'
id("jadx-library")
}
dependencies {
@@ -7,5 +7,5 @@ dependencies {
implementation(project(":jadx-plugins:jadx-java-input"))
implementation('io.github.skylot:raung-asm:0.1.0')
implementation("io.github.skylot:raung-asm:0.1.0")
}
@@ -1,7 +1,7 @@
plugins {
id 'jadx-library'
id("jadx-library")
id 'com.github.johnrengelman.shadow' version '8.1.1'
id("com.github.johnrengelman.shadow") version "8.1.1"
}
dependencies {
@@ -10,17 +10,18 @@ dependencies {
// TODO: Switch back to upstream once this PR gets merged:
// https://github.com/FabricMC/mapping-io/pull/19
// implementation 'net.fabricmc:mapping-io:0.3.0'
api(files('libs/mapping-io-0.4.0-SNAPSHOT.jar'))
api(files("libs/mapping-io-0.4.0-SNAPSHOT.jar"))
constraints {
runtimeOnly 'org.ow2.asm:asm:9.5'
runtimeOnly("org.ow2.asm:asm:9.5")
}
}
publishing {
publications {
shadow(MavenPublication) { publication ->
project.shadow.component(publication)
create<MavenPublication>("maven") {
from(components["java"])
artifact(tasks["shadowJar"])
}
}
}
@@ -23,7 +23,7 @@ sourceSets {
kotlin.srcDirs(
"scripts",
"scripts/gui",
"context"
"context",
)
}
}
@@ -6,9 +6,9 @@ plugins {
dependencies {
implementation(project(":jadx-plugins:jadx-script:jadx-script-runtime"))
implementation(kotlin("scripting-common"))
implementation(kotlin("scripting-jvm"))
implementation(kotlin("scripting-jvm-host"))
implementation(kotlin("scripting-common"))
implementation(kotlin("scripting-jvm"))
implementation(kotlin("scripting-jvm-host"))
implementation("io.github.microutils:kotlin-logging-jvm:3.0.5")
@@ -22,5 +22,4 @@ dependencies {
runtimeOnly(project(":jadx-plugins:jadx-java-convert"))
runtimeOnly(project(":jadx-plugins:jadx-java-input"))
runtimeOnly(project(":jadx-plugins:jadx-raung-input"))
}
@@ -1,18 +0,0 @@
plugins {
id 'jadx-library'
}
dependencies {
api(project(":jadx-core"))
implementation(project(":jadx-plugins:jadx-dex-input"))
implementation('org.smali:smali:2.5.2') {
exclude(group: 'junit', module: 'junit') // ignore junit 4 transitive dependency
}
// force latest version for smali
constraints {
implementation 'com.google.guava:guava:30.1.1-jre'
implementation 'com.beust:jcommander:1.81'
}
}
@@ -0,0 +1,18 @@
plugins {
id("jadx-library")
}
dependencies {
api(project(":jadx-core"))
implementation(project(":jadx-plugins:jadx-dex-input"))
implementation("org.smali:smali:2.5.2") {
exclude(group = "junit", module = "junit") // ignore junit 4 transitive dependency
}
// force latest version for smali
constraints {
implementation("com.google.guava:guava:30.1.1-jre")
implementation("com.beust:jcommander:1.81")
}
}