diff --git a/app/build.gradle b/app/build.gradle index d4134c83..1a4cfda9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -43,7 +43,7 @@ android { } kotlinOptions { jvmTarget = JavaVersion.VERSION_1_8.toString() - languageVersion = "1.4" + languageVersion = "1.6" } testOptions { unitTests.all { diff --git a/app/libs/android.jar b/app/libs/android.jar index 48002e33..5e9d53d4 100644 Binary files a/app/libs/android.jar and b/app/libs/android.jar differ diff --git a/app/libs/libcore.jar b/app/libs/libcore.jar index 94d798d2..2c0049b7 100644 Binary files a/app/libs/libcore.jar and b/app/libs/libcore.jar differ diff --git a/build.gradle b/build.gradle index 9af0718b..e3c1a554 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,11 @@ buildscript { - // 1.3.21 Android 10 // 1.3.61 Android 11 // 1.4.30 Android 12 + // 1.6.10 Android 13 // Check: - // https://android.googlesource.com/platform/external/kotlinc/+/refs/tags/android-12.0.0_r2/build.txt - ext.aosp_kotlin_version = '1.4.31' // 1.4.30 breaks Kotlin plugin in Android Studio - ext.kotlin_version = '1.4.31' + // https://android.googlesource.com/platform/external/kotlinc/+/refs/tags/android-13.0.0_r3/build.txt + ext.aosp_kotlin_version = '1.6.10' // 1.6.10-release-923 in AOSP + ext.kotlin_version = '1.6.10' repositories { mavenCentral() diff --git a/contactsbackup/libs/com.android.vcard.jar b/contactsbackup/libs/com.android.vcard.jar index f677ef61..8060d849 100644 Binary files a/contactsbackup/libs/com.android.vcard.jar and b/contactsbackup/libs/com.android.vcard.jar differ diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 607af4e0..9a0ecb1b 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -1,7 +1,7 @@ ext { - // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-12.0.0_r2/current/androidx/Android.bp#2943 - ext.room_version = "2.3.0-beta02" - // https://android.googlesource.com/platform/external/protobuf/+/refs/tags/android-12.0.0_r2/java/pom.xml#7 + // 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" + // https://android.googlesource.com/platform/external/protobuf/+/refs/tags/android-13.0.0_r3/java/pom.xml#7 ext.protobuf_version = "3.9.1" junit4_version = "4.13.2" junit5_version = "5.5.2" // careful, upgrading this can change a Cipher's IV size in tests!? @@ -37,58 +37,58 @@ ext.kotlin_libs = [ ], coroutines: [ dependencies.create('org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm') { - // https://android.googlesource.com/platform/prebuilts/tools/+/refs/tags/android-12.0.0_r2/common/m2/Android.bp#273 - version { strictly '1.4.2' } + // https://android.googlesource.com/platform/external/kotlinx.coroutines/+/refs/tags/android-13.0.0_r3/CHANGES.md + version { strictly '1.5.2' } }, dependencies.create('org.jetbrains.kotlinx:kotlinx-coroutines-android') { - // https://android.googlesource.com/platform/prebuilts/tools/+/refs/tags/android-12.0.0_r2/common/m2/Android.bp#288 - version { strictly '1.3.0' } + // https://android.googlesource.com/platform/external/kotlinx.coroutines/+/refs/tags/android-13.0.0_r3/CHANGES.md + version { strictly '1.5.2' } }, ], ] ext.std_libs = [ androidx_core: [ - // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-12.0.0_r2/current/androidx/Android.bp#867 + // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-13.0.0_r3/current/androidx/Android.bp#1761 dependencies.create('androidx.core:core') { - version { strictly '1.6.0' } // should be 1.6.0-beta03, but that is not even released, yet + version { strictly '1.9.0-alpha03' } }, - // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-12.0.0_r2/current/androidx/Android.bp#833 + // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-13.0.0_r3/current/androidx/Android.bp#1727 dependencies.create('androidx.core:core-ktx') { - version { strictly '1.5.0-beta02' } + version { strictly '1.9.0-alpha03' } }, ], - // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-12.0.0_r2/current/androidx/Android.bp#1189 + // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-13.0.0_r3/current/androidx/Android.bp#2159 androidx_fragment: dependencies.create('androidx.fragment:fragment-ktx') { - version { strictly '1.4.0-alpha01' } + version { strictly '1.4.0-alpha09' } }, - // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-12.0.0_r2/current/androidx/Android.bp#20 + // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-13.0.0_r3/current/androidx/Android.bp#57 androidx_activity: dependencies.create('androidx.activity:activity-ktx') { - version { strictly '1.3.0-alpha03' } + version { strictly '1.4.0-alpha02' } }, - // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-12.0.0_r2/current/androidx/Android.bp#2695 + // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-13.0.0_r3/current/androidx/Android.bp#3597 androidx_preference: dependencies.create('androidx.preference:preference') { - version { strictly '1.1.1' } // should be 1.2.0-alpha01, but that is not even released, yet + version { strictly '1.2.0-alpha01' } }, - // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-12.0.0_r2/current/androidx/Android.bp#1820 + // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-13.0.0_r3/current/androidx/Android.bp#2754 androidx_lifecycle_viewmodel_ktx: dependencies.create('androidx.lifecycle:lifecycle-viewmodel-ktx') { - version { strictly '2.4.0-alpha01' } + version { strictly '2.4.0-alpha03' } // 2.4.0-alpha04 in AOSP but was never released }, - // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-12.0.0_r2/current/androidx/Android.bp#1618 + // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-13.0.0_r3/current/androidx/Android.bp#2550 androidx_lifecycle_livedata_ktx: dependencies.create('androidx.lifecycle:lifecycle-livedata-ktx') { - version { strictly '2.4.0-alpha01' } + version { strictly '2.4.0-alpha03' } // 2.4.0-alpha04 in AOSP but was never released }, - // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-12.0.0_r2/current/extras/constraint-layout-x/Android.bp#39 + // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-13.0.0_r3/current/extras/constraint-layout-x/Android.bp#39 androidx_constraintlayout: dependencies.create('androidx.constraintlayout:constraintlayout') { version { strictly '2.0.0-beta7' } }, - // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-12.0.0_r2/current/androidx/Android.bp#969 + // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-13.0.0_r3/current/androidx/Android.bp#1865 androidx_documentfile: dependencies.create('androidx.documentfile:documentfile') { - version { strictly '1.1.0-alpha01' } + 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-12.0.0_r2/current/extras/material-design-x/Android.bp#6 + // https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-13.0.0_r3/current/extras/material-design-x/Android.bp#6 com_google_android_material: dependencies.create('com.google.android.material:material') { - version { strictly '1.4.0' } + version { strictly '1.6.0-alpha03' } // 1.6.0-alpha0301 in AOSP }, ] diff --git a/storage/lib/build.gradle b/storage/lib/build.gradle index e9544b3d..1860c9af 100644 --- a/storage/lib/build.gradle +++ b/storage/lib/build.gradle @@ -33,7 +33,7 @@ android { } kotlinOptions { jvmTarget = '1.8' - languageVersion = "1.4" + languageVersion = "1.6" freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn' freeCompilerArgs += '-Xexplicit-api=strict' }