Skip to content

Commit 0271e65

Browse files
authored
Merge pull request #8 from skydoves/kotlin/2.1.10
Bump Kotlin to 2.1.10
2 parents f6c5edc + d44d718 commit 0271e65

9 files changed

Lines changed: 65 additions & 55 deletions

File tree

.gitignore

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,19 @@
88
# Java class files
99
*.class
1010

11+
# Kotlin
12+
.kotlin
13+
1114
# Generated files
1215
bin/
1316
gen/
1417
out/
1518

1619
# Gradle files
17-
/.idea
1820
.gradle/
1921
build/
22+
.cxx/
23+
2024

2125
# Local configuration file (sdk path, etc)
2226
local.properties
@@ -35,15 +39,13 @@ captures/
3539

3640
# Intellij
3741
*.iml
38-
.idea/workspace.xml
39-
.idea/tasks.xml
40-
.idea/gradle.xml
41-
.idea/dictionaries
42-
.idea/libraries
42+
/.idea/*
43+
!.idea/codeInsightSettings.xml
4344
app/.idea/
4445

45-
# Mac
46+
# DS_Store
4647
*.DS_Store
48+
**/DS_Store
4749

4850
# Keystore files
4951
*.jks
@@ -54,7 +56,5 @@ app/.idea/
5456
# Google Services (e.g. APIs or Firebase)
5557
google-services.json
5658

57-
# Freeline
58-
freeline.py
59-
freeline/
60-
freeline_project_description.json
59+
# Temporary API docs
60+
docs/api

app/build.gradle.kts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
id(libs.plugins.android.application.get().pluginId)
33
id(libs.plugins.kotlin.android.get().pluginId)
4+
id(libs.plugins.compose.compiler.get().pluginId)
45
id(libs.plugins.ksp.get().pluginId) version libs.versions.ksp.get()
56
}
67

@@ -20,10 +21,6 @@ android {
2021
compose = true
2122
}
2223

23-
composeOptions {
24-
kotlinCompilerExtensionVersion = libs.versions.androidxComposeCompiler.get()
25-
}
26-
2724
compileOptions {
2825
sourceCompatibility = JavaVersion.VERSION_17
2926
targetCompatibility = JavaVersion.VERSION_17

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ plugins {
22
alias(libs.plugins.android.application) apply false
33
alias(libs.plugins.android.library) apply false
44
alias(libs.plugins.kotlin.android) apply false
5+
alias(libs.plugins.compose.compiler) apply false
56
alias(libs.plugins.nexusPlugin)
67
alias(libs.plugins.spotless)
78
alias(libs.plugins.dokka)

buildSrc/src/main/kotlin/Configuration.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
object Configuration {
2-
const val compileSdk = 33
3-
const val targetSdk = 33
2+
const val compileSdk = 35
3+
const val targetSdk = 35
44
const val minSdk = 21
55
const val majorVersion = 1
66
const val minorVersion = 0

gradle/libs.versions.toml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
[versions]
2-
agp = "8.1.0"
3-
kotlin = "1.9.0"
4-
jvmTarget = "17"
5-
kotlinpoet = "1.13.2"
6-
ksp = "1.9.0-1.0.12"
7-
material = "1.9.0"
8-
androidxActivity = "1.4.0"
9-
androidxCompose = "1.4.3"
10-
androidxComposeCompiler = "1.5.1"
11-
landscapist = "2.2.3"
12-
coroutines = "1.7.2"
2+
agp = "8.9.0"
3+
kotlin = "2.1.10"
4+
jvmTarget = "18"
5+
kotlinpoet = "1.18.1"
6+
ksp = "2.1.10-1.0.31"
7+
material = "1.12.0"
8+
androidxActivity = "1.10.1"
9+
androidxCompose = "1.8.1"
10+
landscapist = "2.4.6"
11+
coroutines = "1.10.2"
1312
retrofit = "2.9.0"
14-
retrofitAdapters = "1.0.6"
13+
retrofitAdapters = "1.0.10"
1514

1615
[plugins]
1716
android-application = { id = "com.android.application", version.ref = "agp" }
1817
android-library = { id = "com.android.library", version.ref = "agp" }
1918
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
20-
dokka = { id = "org.jetbrains.dokka", version = "1.8.20" }
19+
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
20+
dokka = { id = "org.jetbrains.dokka", version = "2.0.0" }
2121
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
2222
nexusPlugin = { id = "io.github.gradle-nexus.publish-plugin", version = "1.3.0" }
2323
spotless = { id = "com.diffplug.spotless", version = "6.9.0" }
24-
kotlinBinaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.13.2" }
24+
kotlinBinaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.17.0" }
2525

2626
[libraries]
2727
agp = { module = "com.android.tools.build:gradle", version.ref = "agp" }

gradle/wrapper/gradle-wrapper.jar

-17.6 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
#Tue May 13 17:42:16 KST 2025
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
45
networkTimeout=10000
6+
validateDistributionUrl=true
57
zipStoreBase=GRADLE_USER_HOME
68
zipStorePath=wrapper/dists

gradlew

Lines changed: 21 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 12 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)