Merge pull request #443 from fmonniot/dependabot/gradle/com.google.de…

…vtools.ksp-2.0.20-1.0.25 Bump com.google.devtools.ksp from 1.9.23-1.0.20 to 2.0.20-1.0.25
fmonniot · Sep 28, 2024 · a6d0336 · a6d0336
2 parents 09cf2be + 29900a9
commit a6d0336
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,9 @@
 # Java class files
 *.class
 
+# Kotlin files
+.kotlin/
+
 # Generated files
 bin/
 gen/

diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,6 +2,7 @@ plugins {
     id 'com.android.application'
     id 'kotlin-android'
     id 'com.google.devtools.ksp'
+    id 'org.jetbrains.kotlin.plugin.compose' version '2.0.20'
 }
 
 android {
@@ -48,9 +49,6 @@ android {
         compose true
         buildConfig true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion '1.5.12'
-    }
 
     testOptions {
         unitTests {

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -20,4 +20,10 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
-#-keep class org.xmlpull.v1.** { *; }
+-dontwarn org.xmlpull.v1.**
+-dontwarn org.kxml2.io.**
+-dontwarn android.content.res.**
+-dontwarn org.slf4j.impl.StaticLoggerBinder
+
+-keep class org.xmlpull.** { *; }
+-keepclassmembers class org.xmlpull.** { *; }
diff --git a/build.gradle b/build.gradle
@@ -7,12 +7,12 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:8.6.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
     }
 }
 
 plugins {
-    id 'com.google.devtools.ksp' version '1.9.23-1.0.20' apply false
+    id 'com.google.devtools.ksp' version '2.0.20-1.0.25' apply false
 }
 
 allprojects {