Minor cleanup to module repos

This commit is contained in:
arkon 2021-10-09 15:03:01 -04:00
parent 894fc987dd
commit 300bb7cbae
4 changed files with 5 additions and 43 deletions

1
.gitignore vendored
View File

@ -2,6 +2,7 @@
.gradle .gradle
.idea .idea
gradle.properties gradle.properties
local.properties
# Ignore Gradle build output directory # Ignore Gradle build output directory
build build

View File

@ -1,21 +1,8 @@
plugins { plugins {
application application
kotlin("plugin.serialization") kotlin("plugin.serialization")
} }
repositories {
mavenCentral()
maven {
url = uri("https://jitpack.io")
}
maven {
url = uri("https://maven.google.com")
}
}
dependencies { dependencies {
// Android stub library // Android stub library
implementation(fileTree("lib/")) implementation(fileTree("lib/"))
@ -53,16 +40,3 @@ tasks {
kotlinOptions.freeCompilerArgs = listOf("-Xopt-in=kotlin.RequiresOptIn") 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
//

View File

@ -14,8 +14,9 @@ allprojects {
mavenCentral() mavenCentral()
maven("https://maven.google.com/") maven("https://maven.google.com/")
maven("https://jitpack.io") maven("https://jitpack.io")
maven("https://oss.sonatype.org/content/repositories/snapshots/")
maven("https://dl.google.com/dl/android/maven2/") 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 // APK parser
implementation("net.dongliu:apk-parser:2.6.10") implementation("net.dongliu:apk-parser:2.6.10")
} }
} }

View File

@ -12,15 +12,6 @@ plugins {
id("de.fuerstenau.buildconfig") version "1.1.8" id("de.fuerstenau.buildconfig") version "1.1.8"
} }
repositories {
maven {
url = uri("https://repo1.maven.org/maven2/")
}
maven {
url = uri("https://jitpack.io")
}
}
dependencies { dependencies {
// okhttp // okhttp
val okhttpVersion = "4.9.1" // version is locked by Tachiyomi extensions val okhttpVersion = "4.9.1" // version is locked by Tachiyomi extensions
@ -57,12 +48,6 @@ dependencies {
val MainClass = "suwayomi.tachidesk.MainKt" val MainClass = "suwayomi.tachidesk.MainKt"
application { application {
mainClass.set(MainClass) mainClass.set(MainClass)
// for testing electron
// applicationDefaultJvmArgs = listOf(
// "-Dsuwayomi.tachidesk.webInterface=electron",
// "-Dsuwayomi.tachidesk.electronPath=/usr/bin/electron"
// )
} }
sourceSets { sourceSets {
@ -117,6 +102,7 @@ tasks {
archiveVersion.set(inspectorVersion) archiveVersion.set(inspectorVersion)
archiveClassifier.set(inspectorRevision) archiveClassifier.set(inspectorRevision)
} }
withType<KotlinCompile> { withType<KotlinCompile> {
kotlinOptions { kotlinOptions {
freeCompilerArgs = listOf( freeCompilerArgs = listOf(