Skip to content

Commit 0c67da0

Browse files
committed
dep upgrades, get rid of "parcelize", upgrade to ksp2, disable jetifier
1 parent 14e4822 commit 0c67da0

File tree

4 files changed

+12
-13
lines changed

4 files changed

+12
-13
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
android:theme="@style/AppTheme"
1313
android:windowSoftInputMode="adjustResize">
1414
<activity
15-
android:name=".ComposeMainActivity"
15+
android:name=".MainActivity"
1616
android:exported="true"
1717
android:theme="@style/AppTheme">
1818
<intent-filter>
@@ -23,7 +23,7 @@
2323
</activity>
2424

2525
<activity
26-
android:name=".MainActivity"
26+
android:name=".ComposeMainActivity"
2727
android:exported="false" />
2828
</application>
2929

build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
1313
with(pluginManager) {
1414
apply("com.android.application")
1515
apply("org.jetbrains.kotlin.android")
16-
apply("org.jetbrains.kotlin.plugin.parcelize")
1716
}
1817

1918
group = "de.markusressel.kodeeditor.demo"

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ org.gradle.jvmargs=-Xmx1536m
1212
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1313
# org.gradle.parallel=true
1414
android.useAndroidX=true
15-
android.enableJetifier=true
15+
android.enableJetifier=false
1616
android.nonTransitiveRClass=false
1717
android.nonFinalResIds=false

gradle/libs.versions.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
[versions]
2-
activityCompose = "1.10.1"
3-
androidComposeMaterial3 = "1.3.2"
2+
activityCompose = "1.11.0"
3+
androidComposeMaterial3 = "1.4.0"
44
androidDesugarJdkLibs = "2.1.5"
55
androidGradlePlugin = "8.13.0"
66
androidxAnnotation = "1.9.1"
77
androidxAppCompat = "1.7.1"
8-
androidxComposeBom = "2025.09.00"
9-
androidxComposeUi = "1.9.0"
10-
androidxComposeUiText = "1.9.1"
11-
androidxLifecycle = "2.9.3"
8+
androidxComposeBom = "2025.10.01"
9+
androidxComposeUi = "1.9.4"
10+
androidxComposeUiText = "1.9.4"
11+
androidxLifecycle = "2.9.4"
1212
androidxTestExtJunit = "1.3.0"
1313
androidxTestEspressoCore = "3.7.0"
14-
dokkaGradlePlugin = "2.0.0"
14+
dokkaGradlePlugin = "2.1.0"
1515
fuel = "2.3.1"
1616
flowbindingAndroid = "1.2.0"
1717
junit4 = "4.13.2"
18-
kotlin = "2.2.10"
18+
kotlin = "2.2.21"
1919
kotlinCoroutinesCore = "1.10.2"
2020
kotlinCoroutinesAndroid = "1.10.2"
2121
kodehighlighter = "4.0.4"
22-
ksp = "2.2.10-2.0.2"
22+
ksp = "2.3.0"
2323
material = "1.13.0"
2424
zoomlayout = "1.9.0"
2525

0 commit comments

Comments
 (0)