diff --git a/common.gradle b/common.gradle index 5dc8a179a..5463638ae 100644 --- a/common.gradle +++ b/common.gradle @@ -61,6 +61,5 @@ dependencies { } apply from: "$rootDir/common-dependencies.gradle" - preBuild.dependsOn(lintKotlin) lintKotlin.dependsOn(formatKotlin) diff --git a/multisrc/build.gradle.kts b/multisrc/build.gradle.kts index 3f128aa7a..bccb47ba5 100644 --- a/multisrc/build.gradle.kts +++ b/multisrc/build.gradle.kts @@ -20,8 +20,6 @@ repositories { // dependencies apply("$rootDir/common-dependencies.gradle") - - tasks.register("runAllGenerators") { doLast { val isWindows = System.getProperty("os.name").toString().toLowerCase().contains("win") @@ -31,7 +29,7 @@ tasks.register("runAllGenerators") { "$projectDir/build/intermediates/aar_main_jar/debug/classes.jar" // jar made from this module )) .joinToString(if (isWindows) ";" else ":") - val javaPath = System.getProperty("java.home") + "/bin/java" // path of java + val javaPath = "${System.getProperty("java.home")}/bin/java" val mainClass = "eu.kanade.tachiyomi.multisrc.GeneratorMainKt" // Main class we want to execute @@ -43,7 +41,7 @@ tasks.register("runAllGenerators") { val javaProcess = Runtime.getRuntime().exec(javaCommand) val exitCode = javaProcess.waitFor() if (exitCode != 0){ - throw Exception("Running java failed with exit code: $exitCode") + throw Exception("Java process failed with exit code: $exitCode") } } } diff --git a/multisrc/src/main/AndroidManifest.xml b/multisrc/src/main/AndroidManifest.xml index 0730970dd..17ee0c14a 100644 --- a/multisrc/src/main/AndroidManifest.xml +++ b/multisrc/src/main/AndroidManifest.xml @@ -1,2 +1 @@ - +