Merge pull request #109 from KakaoCup/gradle-cleanup

Some gradle-related cleanup
KakaoCup · Jan 5, 2024 · abb5719 · abb5719
2 parents 44b7be9 + 64b02a5
commit abb5719
Show file tree

Hide file tree

Showing 21 changed files with 248 additions and 407 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,19 +1,3 @@
-buildscript {
-    repositories {
-        mavenCentral()
-        google()
-        gradlePluginPortal()
-    }
-    dependencies {
-        classpath(libs.com.android.tools.build.gradle)
-    }
-}
-
-repositories {
-    gradlePluginPortal()
-    google()
-}
-
 plugins {
     id("io.gitlab.arturbosch.detekt") version libs.versions.detekt
 }
@@ -33,15 +17,6 @@ detekt {
     }
 }
 
-subprojects {
-    repositories {
-        mavenCentral()
-        google()
-    }
-
-    group = Description.mavenGroup
-}
-
 tasks.wrapper {
     distributionType = Wrapper.DistributionType.ALL
     gradleVersion = libs.versions.gradle.get()

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -2,15 +2,11 @@ plugins {
     `kotlin-dsl`
 }
 
-repositories {
-    google()
-    mavenCentral()
-    gradlePluginPortal()
-}
-
 dependencies {
-    implementation(libs.org.jetbrains.kotlin.kotlinGradlePlugin )
+    implementation(libs.org.jetbrains.kotlin.kotlinGradlePlugin)
     implementation(libs.com.android.tools.build.gradle)
     implementation(libs.org.jetbrains.dokka.dokkaGradlePlugin)
     implementation(libs.org.kohsuke.githubApi)
+    // workaround for https://github.com/gradle/gradle/issues/15383
+    implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
 }
diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
@@ -4,4 +4,10 @@ dependencyResolutionManagement {
             from(files("../gradle/libs.versions.toml"))
         }
     }
+
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
 }
diff --git a/buildSrc/src/main/kotlin/KakaoDeployment.kt b/buildSrc/src/main/kotlin/KakaoDeployment.kt
diff --git a/buildSrc/src/main/kotlin/KakaoExtClicksDeployment.kt b/buildSrc/src/main/kotlin/KakaoExtClicksDeployment.kt
diff --git a/buildSrc/src/main/kotlin/PackageInfo.kt b/buildSrc/src/main/kotlin/PackageInfo.kt
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
diff --git a/buildSrc/src/main/kotlin/convention.android-base.gradle.kts b/buildSrc/src/main/kotlin/convention.android-base.gradle.kts
@@ -0,0 +1,12 @@
+import com.android.build.gradle.BaseExtension
+import io.github.kakaocup.withVersionCatalog
+
+withVersionCatalog { libs ->
+    configure<BaseExtension> {
+        compileSdkVersion(libs.versions.compileSdk.get().toInt())
+        defaultConfig {
+            minSdk = libs.versions.minSdk.get().toInt()
+            multiDexEnabled = true
+        }
+    }
+}