diff --git a/build.gradle b/build.gradle index 83ac2313f..c1a8552fd 100644 --- a/build.gradle +++ b/build.gradle @@ -1,27 +1,6 @@ -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - // https://github.com/gradle/gradle/issues/16958 - classpath "${libs.plugins.android.get()}" - classpath "${libs.plugins.kotlin.get()}" - classpath "${libs.plugins.hilt.get()}" - classpath "${libs.plugins.ksp.get()}" - } -} - -allprojects { - repositories { - google() - mavenCentral() - maven { - url 'https://jitpack.io' - } - } -} - -tasks.register('clean', Delete) { - delete rootProject.layout.buildDirectory +plugins { + alias(libs.plugins.android.application) apply false + alias(libs.plugins.kotlin) apply false + alias(libs.plugins.hilt) apply false + alias(libs.plugins.ksp) apply false } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3d89e71eb..2f30f76e0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,15 +14,15 @@ coroutines = "1.9.0" desugar = "2.1.3" diskLruCache = "1.4" fragment = "1.8.5" -gradle = "8.7.2" +gradle = "8.7.3" guava = "33.3.1-android" -hilt = "2.52" +hilt = "2.53" hiltWork = "1.2.0" json = "20240303" junit = "4.13.2" junitKtx = "1.2.1" -kotlin = "2.0.21" -kspPlugin = "2.0.21-1.0.27" +kotlin = "2.1.0" +ksp = "2.1.0-1.0.29" leakcanary = "3.0-alpha-8" lifecycle = "2.8.7" markwon = "4.6.2" @@ -42,7 +42,7 @@ transition = "1.5.1" viewpager2 = "1.1.0" webkit = "1.12.1" workRuntime = "2.10.0" -workinspector = "5778dd1747" +workinspector = "1.0" [libraries] acra-dialog = { module = "ch.acra:acra-dialog", version.ref = "acra" } @@ -108,7 +108,7 @@ ssiv = { module = "com.github.KotatsuApp:subsampling-scale-image-view", version. workinspector = { module = "com.github.Koitharu:WorkInspector", version.ref = "workinspector" } [plugins] -android = { id = "com.android.tools.build:gradle", version.ref = "gradle" } -hilt = { id = "com.google.dagger:hilt-android-gradle-plugin", version.ref = "hilt" } -kotlin = { id = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } -ksp = { id = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "kspPlugin" } +android-application = { id = "com.android.application", version.ref = "gradle" } +kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } +hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0e345a501..022a2d23f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ #Wed Apr 03 08:23:55 EEST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index 2fba1a29b..c67f6b910 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,32 @@ +pluginManagement { + repositories { + google { + content { + includeGroupByRegex("com\\.android.*") + includeGroupByRegex("com\\.google.*") + includeGroupByRegex("androidx.*") + } + } + mavenCentral() + gradlePluginPortal() + maven { + url 'https://jitpack.io' + content { + includeGroupByRegex("com\\.github.*") + } + } + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + maven { + url 'https://jitpack.io' + } + } +} + include ':app' -rootProject.name = "Kotatsu" \ No newline at end of file +rootProject.name = "Kotatsu"