Merge pull request #926 from NUmeroAndDev/bump_target_sdk_to_35

Bump target sdk version to 35
DroidKaigi · Sep 2, 2024 · 800a200 · 800a200
2 parents 24ec63a + cfbceac
commit 800a200
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/app-android/src/main/AndroidManifest.xml b/app-android/src/main/AndroidManifest.xml
@@ -34,11 +34,11 @@
 
         <activity
             android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"
-            android:theme="@style/Theme.AppCompat.DayNight.DarkActionBar" />
+            android:theme="@style/Theme.KaigiApp.Licenses" />
 
         <activity
             android:name="com.google.android.gms.oss.licenses.OssLicensesActivity"
-            android:theme="@style/Theme.AppCompat.DayNight.DarkActionBar" />
+            android:theme="@style/Theme.KaigiApp.Licenses" />
 
         <provider
             android:name="androidx.core.content.FileProvider"

diff --git a/app-android/src/main/res/values/themes.xml b/app-android/src/main/res/values/themes.xml
@@ -4,4 +4,8 @@
     <style name="Theme.KaigiApp" parent="android:Theme.Material.NoActionBar">
         <item name="android:statusBarColor">@android:color/transparent</item>
     </style>
+
+    <style name="Theme.KaigiApp.Licenses" parent="Theme.AppCompat.DayNight.DarkActionBar">
+        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
+    </style>
 </resources>
diff --git a/build-logic/src/main/kotlin/io/github/droidkaigi/confsched/primitive/AndroidGradleDsl.kt b/build-logic/src/main/kotlin/io/github/droidkaigi/confsched/primitive/AndroidGradleDsl.kt
@@ -31,11 +31,11 @@ fun Project.setupAndroid() {
         namespace?.let {
             this.namespace = it
         }
-        compileSdkVersion(34)
+        compileSdkVersion(35)
 
         defaultConfig {
             minSdk = 24
-            targetSdk = 34
+            targetSdk = 35
         }
 
         compileOptions {