Skip to content

Navigation Menu

Sign in

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 5a05ecd

Browse filesBrowse files
xJac0btmaxxdd
xJac0b
and
tmaxxdd
authored
support kotlin 2.0.20 (#31)
Co-authored-by: Tomasz Kądziołka <tmax0135@gmail.com>
1 parent c04b90e commit 5a05ecd
Copy full SHA for 5a05ecd

File tree

7 files changed

+31
-18
lines changed
Filter options

7 files changed

+31
-18
lines changed

‎androidExample/build.gradle.kts

Copy file name to clipboardExpand all lines: androidExample/build.gradle.kts
+4-3Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ plugins {
44
alias(libs.plugins.kotlin.android)
55
alias(libs.plugins.ksp) apply false
66
alias(libs.plugins.compose)
7+
alias(libs.plugins.compose.compiler)
78
}
89

910
android {
@@ -48,10 +49,10 @@ android {
4849

4950
dependencies {
5051
// Core
51-
implementation("androidx.core:core-ktx:1.12.0")
52-
implementation("androidx.appcompat:appcompat:1.6.1")
52+
implementation(libs.core.ktx)
53+
implementation(libs.appcompat)
5354
// Compose
54-
implementation("androidx.activity:activity-compose:1.8.2")
55+
implementation(libs.activity.compose)
5556
implementation(compose.runtime)
5657
implementation(compose.foundation)
5758
implementation(compose.material)

‎build.gradle.kts

Copy file name to clipboardExpand all lines: build.gradle.kts
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ plugins {
66
kotlin("android") apply false
77
id("com.android.application") apply false
88
id("com.android.library") apply false
9-
id("org.jetbrains.compose") apply false
9+
alias(libs.plugins.compose) apply false
1010
id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
11+
alias(libs.plugins.compose.compiler) apply false
1112
}
1213

1314
apply(from = "publish-root.gradle")

‎desktopExample/build.gradle.kts

Copy file name to clipboardExpand all lines: desktopExample/build.gradle.kts
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ dependencies {
1515
implementation(compose.components.resources)
1616
implementation(compose.desktop.currentOs)
1717
implementation(libs.kodeview)
18+
alias(libs.plugins.compose.compiler)
1819
}
1920

2021
compose.desktop {

‎gradle/libs.versions.toml

Copy file name to clipboard
+15-7Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
11
[versions]
2+
activityCompose = "1.9.2"
3+
appcompat = "1.7.0"
4+
coreKtx = "1.13.1"
25
jvmTarget = "1.8"
36
gradlePlugin = "8.1.0"
4-
kotlin = "1.9.22"
7+
8+
kotlin = "2.0.20"
59
ksp = "1.8.10-1.0.9"
610
kotlinCompilerExtensionVersion = "1.5.3"
7-
kotlinAndroid = "1.9.22"
8-
kotlinMultiplatform = "1.9.22"
9-
compose = "1.5.12"
10-
androidLibrary = "8.1.1"
11+
kotlinAndroid = "2.0.20"
12+
kotlinMultiplatform = "2.0.20"
13+
compose = "1.6.11"
14+
androidLibrary = "8.6.1"
1115
kodeview = "0.8.0"
12-
highlights = "0.8.0"
13-
composeMaterial = "1.2.1"
16+
highlights = "0.7.1"
17+
composeMaterial = "1.4.0"
1418

1519
[libraries]
20+
activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
21+
appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
22+
core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
1623
kodeview = { group = "dev.snipme", name = "kodeview", version.ref = "kodeview" }
1724
highlights = { group = "dev.snipme", name = "highlights", version.ref = "highlights" }
1825
compose-material = { group = "androidx.wear.compose", name = "compose-material", version.ref = "composeMaterial" }
@@ -22,6 +29,7 @@ ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
2229
multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlinMultiplatform" }
2330
jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
2431
compose = { id = "org.jetbrains.compose", version.ref = "compose" }
32+
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
2533
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinAndroid" }
2634
android-application = { id = "com.android.application" }
2735
android-library = { id = "com.android.library", version.ref = "androidLibrary" }

‎kodeview/build.gradle.kts

Copy file name to clipboardExpand all lines: kodeview/build.gradle.kts
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ plugins {
33
alias(libs.plugins.multiplatform)
44
alias(libs.plugins.android.library)
55
alias(libs.plugins.compose)
6+
alias(libs.plugins.compose.compiler)
67
id("maven-publish")
78
id("signing")
89
}

‎settings.gradle.kts

Copy file name to clipboardExpand all lines: settings.gradle.kts
+7-3Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ pluginManagement {
1010
}
1111

1212
plugins {
13-
val kotlinVersion = "1.9.22"
14-
val agpVersion = "8.1.1"
15-
val composeVersion = "1.5.12"
13+
14+
val kotlinVersion = "2.0.20"
15+
val agpVersion = "8.6.1"
16+
val composeVersion = "1.6.11"
17+
1618

1719
kotlin("jvm").version(kotlinVersion)
1820
kotlin("multiplatform").version(kotlinVersion)
@@ -21,6 +23,8 @@ pluginManagement {
2123
id("com.android.application").version(agpVersion)
2224
id("com.android.library").version(agpVersion)
2325
id("org.jetbrains.compose").version(composeVersion)
26+
id("org.jetbrains.kotlin.plugin.compose").version(kotlinVersion)
27+
2428
}
2529
}
2630

‎webExample/build.gradle.kts

Copy file name to clipboardExpand all lines: webExample/build.gradle.kts
+1-4Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
plugins {
33
alias(libs.plugins.multiplatform)
44
alias(libs.plugins.compose)
5+
alias(libs.plugins.compose.compiler)
56
}
67

78
kotlin {
@@ -22,8 +23,4 @@ kotlin {
2223
}
2324
}
2425
}
25-
}
26-
27-
compose.experimental {
28-
web.application {}
2926
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.