Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions buildSrc/src/main/kotlin/convention.android-base.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import com.android.build.gradle.BaseExtension
import com.android.build.api.dsl.CommonExtension
import io.github.kakaocup.withVersionCatalog

withVersionCatalog { libs ->
configure<BaseExtension> {
compileSdkVersion(libs.versions.compileSdk.get().toInt())
defaultConfig {
configure<CommonExtension> {
compileSdk = libs.versions.compileSdk.get().toInt()
defaultConfig.apply {
minSdk = libs.versions.minSdk.get().toInt()
multiDexEnabled = true
}
}
}
27 changes: 12 additions & 15 deletions buildSrc/src/main/kotlin/convention.application.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import com.android.build.gradle.AppExtension
import com.android.build.api.dsl.ApplicationExtension
import io.github.kakaocup.withVersionCatalog

plugins {
Expand All @@ -8,29 +8,26 @@ plugins {
}

withVersionCatalog { libs ->
configure<AppExtension>() {
defaultConfig {
configure<ApplicationExtension> {
defaultConfig.apply {
targetSdk = libs.versions.targetSdk.get().toInt()
multiDexEnabled = true
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

testOptions {
testOptions.apply {
animationsDisabled = true
}

signingConfigs {
create("kakao") {
storeFile = rootProject.layout.projectDirectory.file("buildsystem/debug.keystore").asFile
storePassword = "android"
keyAlias = "kakaodebugkey"
keyPassword = "android"
}
signingConfigs.create("kakao") {
storeFile = rootProject.layout.projectDirectory.file("buildsystem/debug.keystore").asFile
storePassword = "android"
keyAlias = "kakaodebugkey"
keyPassword = "android"
}

buildTypes {
named("debug") {
signingConfig = signingConfigs.getByName("kakao")
}
buildTypes.getByName("debug") {
signingConfig = signingConfigs.getByName("kakao")
}
}
}
9 changes: 4 additions & 5 deletions buildSrc/src/main/kotlin/convention.kotlin.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import io.github.kakaocup.withVersionCatalog
import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidExtension

plugins {
kotlin("android")
}

// Since AGP 9.0 Kotlin support is built in, so 'org.jetbrains.kotlin.android' must not be applied.
// AGP registers the 'kotlin' extension itself once an android plugin is applied.
withVersionCatalog { libs ->
kotlin {
configure<KotlinAndroidExtension> {
jvmToolchain(libs.versions.jvmVersion.get().toInt())
}
}
4 changes: 0 additions & 4 deletions buildSrc/src/main/kotlin/convention.library.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,3 @@ plugins {
id("convention.android-base")
id("convention.kotlin")
}

kotlin {
jvmToolchain(8)
}
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/convention.publishing.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import com.android.build.gradle.LibraryExtension
import com.android.build.api.dsl.LibraryExtension
import io.github.kakaocup.Github
import java.net.URI

Expand Down Expand Up @@ -112,7 +112,7 @@ tasks.register<Zip>("bundleForCentralSigned") {
}

fun readVersion(): String {
return project.properties.getValue("lib.version.${project.name}")?.toString() ?: throw Exception("Undefined version '\"lib.version.${project.name}\"' in versions.properties")
return project.findProperty("lib.version.${project.name}")?.toString() ?: throw Exception("Undefined version '\"lib.version.${project.name}\"' in versions.properties")
}

fun findCollaborators() = Action<MavenPomDeveloperSpec> {
Expand Down
34 changes: 16 additions & 18 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,28 +1,26 @@
[versions]
dokkaGradlePluginVersion = "2.1.0"
githubApiVersion = "1.318"
gradle = "8.13.1"
kotlin = "2.0.0"
gradleVersion = "8.13.1"
compileSdk = "36"
targetSdk = "36"
minSdk = "21"
jvmVersion = "8"

dokkaVersion = "1.9.20"
appcompatVersion = "1.7.1"
dokkaGradlePluginVersion = "2.2.0"
githubApiVersion = "1.330"
gradle = "9.4.0"
kotlin = "2.4.10"
gradleVersion = "9.4.0"
compileSdk = "37"
targetSdk = "37"
minSdk = "23"
jvmVersion = "11"

dokkaVersion = "2.2.0"
appcompatVersion = "1.8.0"
espressoVersion = "3.7.0"

junitVersion = "4.13.2"
junitExtVersion = "1.3.0"
kotlinGradlePluginVersion = "2.0.0"
kotlinGradlePluginVersion = "2.4.10"
multidexVersion = "2.0.1"
materialVersion = "1.13.0"
activityComposeVersion = "1.12.1"
composeMaterialVersion = "1.3.1"
composeCompilerVersion = "1.5.15"
materialVersion = "1.14.0"
activityComposeVersion = "1.13.0"

composeVersion = "1.10.0"
composeVersion = "1.12.0"
materialsIcon = "1.7.8"

[libraries]
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Oct 16 09:29:44 AEST 2025
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 0 additions & 4 deletions sample/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ android {
versionName = "1.0.0"
}

composeOptions {
kotlinCompilerExtensionVersion = libs.versions.composeCompilerVersion.get()
}

packaging {
resources {
pickFirsts += "META-INF/androidx.compose.*.version"
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ buildscript {
gradlePluginPortal()
}
dependencies {
classpath("org.gradle.toolchains:foojay-resolver:0.7.0")
classpath("org.gradle.toolchains:foojay-resolver:1.0.0")
}
}

Expand Down
Loading