fix(build): use Kotlin with explicit project dependency

This commit is contained in:
Skylot
2023-05-17 16:19:18 +01:00
parent 5d3c96ead2
commit ae1b1ce99e
12 changed files with 33 additions and 13 deletions
-10
View File
@@ -4,8 +4,6 @@ plugins {
id 'com.github.ben-manes.versions' version '0.46.0'
id 'se.patrikerdes.use-latest-versions' version '0.2.18'
id 'com.diffplug.spotless' version '6.18.0'
id 'org.jetbrains.kotlin.jvm' version '1.8.21'
}
ext.jadxVersion = System.getenv('JADX_VERSION') ?: "dev"
@@ -14,7 +12,6 @@ println("jadx version: ${jadxVersion}")
allprojects {
apply plugin: 'java'
apply plugin: 'kotlin'
apply plugin: 'checkstyle'
apply plugin: 'com.diffplug.spotless'
apply plugin: 'com.github.ben-manes.versions'
@@ -29,13 +26,6 @@ allprojects {
options.encoding = "UTF-8"
}
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask.class)
.configureEach {
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
}
}
jar {
manifest {
mainAttributes('jadx-version': jadxVersion)
+8
View File
@@ -1,3 +1,11 @@
plugins {
id 'groovy-gradle-plugin'
}
dependencies {
implementation 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21'
}
repositories {
gradlePluginPortal()
}
@@ -0,0 +1,12 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
plugins {
id 'org.jetbrains.kotlin.jvm'
}
tasks.withType(KotlinCompilationTask.class).configureEach {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_11)
}
}
+1
View File
@@ -1,4 +1,5 @@
plugins {
id 'jadx-kotlin'
id 'application'
id 'edu.sc.seis.launch4j' version '2.5.4'
id 'com.github.johnrengelman.shadow' version '8.1.1'
@@ -1,5 +1,6 @@
plugins {
id("jadx-library")
id("jadx-kotlin")
}
dependencies {
@@ -5,7 +5,6 @@ import jadx.core.dex.attributes.nodes.RenameReasonAttr
import jadx.core.dex.nodes.ClassNode
import jadx.core.dex.nodes.MethodNode
import jadx.core.utils.Utils
import jadx.core.utils.log.LOG
import jadx.plugins.kotlin.metadata.model.ClassAliasRename
import jadx.plugins.kotlin.metadata.model.CompanionRename
import jadx.plugins.kotlin.metadata.model.FieldRename
@@ -1,4 +1,4 @@
package jadx.core.utils.log
package jadx.plugins.kotlin.metadata.utils
import org.slf4j.Logger
import org.slf4j.LoggerFactory
@@ -14,7 +14,6 @@ import jadx.core.dex.nodes.BlockNode
import jadx.core.dex.nodes.InsnNode
import jadx.core.dex.nodes.MethodNode
import jadx.core.utils.BlockUtils
import jadx.core.utils.log.LOG
import jadx.plugins.kotlin.metadata.model.FieldRename
import jadx.plugins.kotlin.metadata.model.ToStringRename
@@ -1,3 +1,7 @@
plugins {
id("jadx-kotlin")
}
dependencies {
implementation(project(":jadx-plugins:jadx-script:jadx-script-runtime"))
@@ -1,3 +1,7 @@
plugins {
id("jadx-kotlin")
}
dependencies {
implementation(project(":jadx-plugins:jadx-script:jadx-script-runtime"))
implementation(project(":jadx-plugins:jadx-script:jadx-script-plugin"))
@@ -1,5 +1,6 @@
plugins {
id("jadx-library")
id("jadx-kotlin")
}
dependencies {
@@ -1,5 +1,6 @@
plugins {
id("jadx-library")
id("jadx-kotlin")
}
dependencies {