Skip to content

Commit

Permalink
Minor cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
arkon committed Feb 6, 2021
1 parent 210051b commit 403ee49
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
1 change: 0 additions & 1 deletion common.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,5 @@ dependencies {
}
apply from: "$rootDir/common-dependencies.gradle"


preBuild.dependsOn(lintKotlin)
lintKotlin.dependsOn(formatKotlin)
6 changes: 2 additions & 4 deletions multisrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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

Expand All @@ -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")
}
}
}
3 changes: 1 addition & 2 deletions multisrc/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="eu.kanade.tachiyomi.lib.themesources" />
<manifest package="eu.kanade.tachiyomi.lib.themesources" />

0 comments on commit 403ee49

Please sign in to comment.