From 358f6d0f0c8125c68bf524297c2f47268f66c661 Mon Sep 17 00:00:00 2001
From: Chirayu Desai <chirayudesai1@gmail.com>
Date: Sat, 7 Oct 2023 04:31:34 +0530
Subject: [PATCH] [WiP] Android 14

Change-Id: Ibf5aa7da9d1608094be5afebe5ea0f2bae283fa5
---
 README.md                                   |  4 ++--
 app/src/main/AndroidManifest.xml            |  4 ++--
 build.gradle                                | 11 ++++++-----
 contactsbackup/src/main/AndroidManifest.xml |  4 ++--
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 6cfdd9d0..05ed0c19 100644
--- 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
index f11daef3..58bd3c00 100644
--- 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
index 2a1fe90f..8c75c1af 100644
--- 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
index 3df3c73b..4a6a2d66 100644
--- 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.