[WiP] Android 14

Change-Id: Ibf5aa7da9d1608094be5afebe5ea0f2bae283fa5
seedvault-app · Oct 6, 2023 · d3fbc22 · d3fbc22
1 parent 2bbeece
commit d3fbc22
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -25,8 +25,8 @@ We update it every time Google releases a new Android version, make any changes
 
 This means that for ROMs using SeedVault it's recommended to use the same branch as your android version
 
-- This current branch `android13` is meant for usage with Android 13
-- This is indicated by the version name starting with `13`, and the version code starting with `33` - the Android 13 API version
+- This current branch `android14` is meant for usage with Android 14
+- This is indicated by the version name starting with `14`, and the version code starting with `34` - the Android 14 API version
 
 For older versions of Android, check out [the branches](https://github.com/seedvault-app/seedvault/branches).
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.stevesoltys.seedvault"
-    android:versionCode="33030030"
-    android:versionName="13-3.3">
+    android:versionCode="34030030"
+    android:versionName="14-3.3">
     <!--
     The version code is the targeted SDK_VERSION plus 6 digits for our own version code.
     The version name is the targeted Android version followed by - and our own version name.

diff --git a/build.gradle b/build.gradle
@@ -3,10 +3,11 @@ buildscript {
     // 1.4.30 Android 12
     // 1.6.10 Android 13
     // 1.7.20 Android 13 (QPR2)
+    // 1.8.10 Android 14
     // Check:
-    // https://android.googlesource.com/platform/external/kotlinc/+/refs/tags/android-13.0.0_r32/build.txt
-    ext.aosp_kotlin_version = '1.7.20'  // 1.7.20-release-201 in AOSP
-    ext.kotlin_version = '1.7.20'
+    // https://android.googlesource.com/platform/external/kotlinc/+/refs/tags/android-14.0.0_r1/build.txt
+    ext.aosp_kotlin_version = '1.8.10'  // 1.8.10-release-430 in AOSP
+    ext.kotlin_version = '1.8.10'
 }
 
 plugins {
@@ -20,9 +21,9 @@ plugins {
 }
 
 ext {
-    compileSdk = 33
+    compileSdk = 34
     minSdk = 32
-    targetSdk = 33
+    targetSdk = 34
 }
 
 apply from: 'gradle/dependencies.gradle'

diff --git a/contactsbackup/src/main/AndroidManifest.xml b/contactsbackup/src/main/AndroidManifest.xml
@@ -6,8 +6,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="org.calyxos.backup.contacts"
-    android:versionCode="33030030"
-    android:versionName="13-3.3">
+    android:versionCode="34030030"
+    android:versionName="14-3.3">
     <!--
     The version code is the targeted SDK_VERSION plus 6 digits for our own version code.
     The version name is the targeted Android version followed by - and our own version name.

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -1,8 +1,8 @@
 ext {
     // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-13.0.0_r3/current/androidx/Android.bp#3901
     ext.room_version = "2.4.0-alpha05" // 2.5.0-alpha01 in AOSP but needs testing
-    // https://android.googlesource.com/platform/external/protobuf/+/refs/tags/android-13.0.0_r32/java/pom.xml#7
-    ext.protobuf_version = "3.9.1"
+    // https://android.googlesource.com/platform/external/protobuf/+/refs/tags/android-14.0.0_r1/java/pom.xml#7
+    ext.protobuf_version = "3.21.7"
 
     // test dependencies below - these do not care about AOSP and can be freely updated
     junit4_version = "4.13.2"
@@ -39,56 +39,56 @@ ext.kotlin_libs = [
     ],
     coroutines: [
         dependencies.create('org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm') {
-            // https://android.googlesource.com/platform/external/kotlinx.coroutines/+/refs/tags/android-13.0.0_r32/CHANGES.md
+            // https://android.googlesource.com/platform/external/kotlinx.coroutines/+/refs/tags/android-14.0.0_r1/CHANGES.md
             version { strictly '1.6.4' }
         },
         dependencies.create('org.jetbrains.kotlinx:kotlinx-coroutines-android') {
-            // https://android.googlesource.com/platform/external/kotlinx.coroutines/+/refs/tags/android-13.0.0_r32/CHANGES.md
+            // https://android.googlesource.com/platform/external/kotlinx.coroutines/+/refs/tags/android-14.0.0_r1/CHANGES.md
             version { strictly '1.6.4' }
         },
     ],
 ]
 
 ext.std_libs = [
     androidx_core: [
-        // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-13.0.0_r32/current/androidx/Android.bp#2275
+        // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-14.0.0_r1/current/androidx/Android.bp#2420
         dependencies.create('androidx.core:core') {
             version { strictly '1.9.0-alpha05' } // 1.9.0-alpha03 in AOSP but has SDK version issues
         },
-        // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-13.0.0_r32/current/androidx/Android.bp#2241
+        // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-14.0.0_r1/current/androidx/Android.bp#2386
         dependencies.create('androidx.core:core-ktx') {
             version { strictly '1.9.0-alpha05' } // 1.9.0-alpha03 in AOSP but has SDK version issues
         },
     ],
-    // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-13.0.0_r32/current/androidx/Android.bp#2705
+    // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-14.0.0_r1/current/androidx/Android.bp#2849
     androidx_fragment: dependencies.create('androidx.fragment:fragment-ktx') {
         version { strictly '1.5.0-alpha03' }
     },
-    // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-13.0.0_r32/current/androidx/Android.bp#61
+    // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-14.0.0_r1/current/androidx/Android.bp#61
     androidx_activity: dependencies.create('androidx.activity:activity-ktx') {
         version { strictly '1.5.0-alpha03' }
     },
-    // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-13.0.0_r32/current/androidx/Android.bp#4275
+    // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-14.0.0_r1/current/androidx/Android.bp#4420
     androidx_preference: dependencies.create('androidx.preference:preference') {
         version { strictly '1.2.0-alpha01' }
     },
-    // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-13.0.0_r3/current/androidx/Android.bp#3376
+    // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-13.0.0_r3/current/androidx/Android.bp#3521
     androidx_lifecycle_viewmodel_ktx: dependencies.create('androidx.lifecycle:lifecycle-viewmodel-ktx') {
         version { strictly '2.5.0-alpha03' }
     },
-    // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-13.0.0_r32/current/androidx/Android.bp#3134
+    // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-14.0.0_r1/current/androidx/Android.bp#3279
     androidx_lifecycle_livedata_ktx: dependencies.create('androidx.lifecycle:lifecycle-livedata-ktx') {
         version { strictly '2.5.0-alpha03' }
     },
-    // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-13.0.0_r3/current/extras/constraint-layout-x/Android.bp#64
+    // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-14.0.0_r1/current/androidx/Android.bp#2244
     androidx_constraintlayout: dependencies.create('androidx.constraintlayout:constraintlayout') {
         version { strictly '2.2.0-alpha05' }
     },
-    // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-13.0.0_r32/current/androidx/Android.bp#2411
+    // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-14.0.0_r1/current/androidx/Android.bp#2556
     androidx_documentfile: dependencies.create('androidx.documentfile:documentfile') {
         version { strictly '1.1.0-alpha01' } // 1.1.0-alpha02 in AOSP but not released yet
     },
-    // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-13.0.0_r32/current/extras/material-design-x/Android.bp#6
+    // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-14.0.0_r1/current/extras/material-design-x/Android.bp#15
     com_google_android_material: dependencies.create('com.google.android.material:material') {
         version { strictly '1.7.0-alpha03' }
     },