From 300bb7cbaeb38be6370fd60cf52160bd78a2ae1a Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 9 Oct 2021 15:03:01 -0400 Subject: [PATCH] Minor cleanup to module repos --- .gitignore | 1 + AndroidCompat/build.gradle.kts | 26 -------------------------- build.gradle.kts | 5 +++-- server/build.gradle.kts | 16 +--------------- 4 files changed, 5 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index 8d85ed7..80c6a2b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ .gradle .idea gradle.properties +local.properties # Ignore Gradle build output directory build diff --git a/AndroidCompat/build.gradle.kts b/AndroidCompat/build.gradle.kts index c7f80f1..bb1dc63 100644 --- a/AndroidCompat/build.gradle.kts +++ b/AndroidCompat/build.gradle.kts @@ -1,21 +1,8 @@ - plugins { application kotlin("plugin.serialization") } - -repositories { - mavenCentral() - maven { - url = uri("https://jitpack.io") - } - - maven { - url = uri("https://maven.google.com") - } -} - dependencies { // Android stub library implementation(fileTree("lib/")) @@ -53,16 +40,3 @@ tasks { kotlinOptions.freeCompilerArgs = listOf("-Xopt-in=kotlin.RequiresOptIn") } } - -//def fatJarTask = tasks.getByPath(':AndroidCompat:JVMPatch:fatJar') -// -//// Copy JVM core patches -//task copyJVMPatches(type: Copy) { -// from fatJarTask.outputs.files -// into 'src/main/resources/patches' -//} -// -//compileOnly(Java.dependsOn gradle.includedBuild('dex2jar').task(':dex-translator:assemble') -//compileOnly(Java.dependsOn copyJVMPatches -//copyJVMPatches.dependsOn fatJarTask -// diff --git a/build.gradle.kts b/build.gradle.kts index d833968..840fa7f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,8 +14,9 @@ allprojects { mavenCentral() maven("https://maven.google.com/") maven("https://jitpack.io") - maven("https://oss.sonatype.org/content/repositories/snapshots/") maven("https://dl.google.com/dl/android/maven2/") + maven("https://repo1.maven.org/maven2/") + maven("https://oss.sonatype.org/content/repositories/snapshots/") } } @@ -82,4 +83,4 @@ configure(projects) { // APK parser implementation("net.dongliu:apk-parser:2.6.10") } -} \ No newline at end of file +} diff --git a/server/build.gradle.kts b/server/build.gradle.kts index d0e1ed9..b7bd492 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -12,15 +12,6 @@ plugins { id("de.fuerstenau.buildconfig") version "1.1.8" } -repositories { - maven { - url = uri("https://repo1.maven.org/maven2/") - } - maven { - url = uri("https://jitpack.io") - } -} - dependencies { // okhttp val okhttpVersion = "4.9.1" // version is locked by Tachiyomi extensions @@ -57,12 +48,6 @@ dependencies { val MainClass = "suwayomi.tachidesk.MainKt" application { mainClass.set(MainClass) - - // for testing electron -// applicationDefaultJvmArgs = listOf( -// "-Dsuwayomi.tachidesk.webInterface=electron", -// "-Dsuwayomi.tachidesk.electronPath=/usr/bin/electron" -// ) } sourceSets { @@ -117,6 +102,7 @@ tasks { archiveVersion.set(inspectorVersion) archiveClassifier.set(inspectorRevision) } + withType { kotlinOptions { freeCompilerArgs = listOf(