Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Weblate > android15 #1

Open
wants to merge 10 commits into
base: android15
Choose a base branch
from
Open

Weblate > android15 #1

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6d24658
Release 14-5.1
grote Dec 10, 2024
fa1d209
Revert "Bump target and compile SDK to API 35"
grote Dec 10, 2024
867344e
Revert "Update AGP, Gradle and dependencies to AOSP versions"
grote Dec 10, 2024
095c7c9
Revert (partial) "Bump version to 15-4.1, mention 15 in README"
grote Dec 10, 2024
1eb2a73
Merge pull request #811 from grote/android14-merge15
grote Dec 10, 2024
8e819ff
Bump version to 15-5.2
chirayudesai Dec 24, 2024
910ecfa
Merge tag '15-5.2' of https://github.com/seedvault-app/seedvault to a…
chirayudesai Dec 27, 2024
419b65f
Change version to 14-5.2
chirayudesai Dec 27, 2024
1229cea
Merge pull request #823 from grote/android14-backports
chirayudesai Dec 27, 2024
a4aafeb
Import translations from Weblate
weblate Dec 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert "Update AGP, Gradle and dependencies to AOSP versions" 
This reverts commit a334eb0.
  • Loading branch information
@grote
grote committed Dec 10, 2024
commit 867344eec4169f81855504021ccd44ce5c47d85f
Binary file modified contactsbackup/libs/com.android.vcard.jar
View file
Open in desktop
Binary file not shown.
47 changes: 23 additions & 24 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

[versions]
# Gradle plugin versions
androidGradlePlugin = "8.6.0"
androidGradlePlugin = "8.5.1"
protobufPlugin = "0.9.4"
ktlint = "11.5.0"

Expand All @@ -31,10 +31,9 @@ espresso = "3.4.0"
# 1.8.10 Android 14
# 1.9.0 Android 14 (QPR2)
# 1.9.22 Android 14 (QPR3)
# 1.9.23 Android 15
# Check: https://android.googlesource.com/platform/external/kotlinc/+/refs/tags/android-15.0.0_r1/build.txt
kotlin = { strictly = "1.9.23" }
ksp = "1.9.23-1.0.20" # Keep in match with kotlin version
# Check: https://android.googlesource.com/platform/external/kotlinc/+/refs/tags/android-14.0.0_r53/build.txt
kotlin = { strictly = "1.9.22" }
ksp = "1.9.22-1.0.17" # Keep in match with kotlin version
dokka = "1.9.20" # Dokka has no releases after 1.9.20

# Lint versions
Expand All @@ -45,38 +44,38 @@ logging = { strictly = "6.0.3" }
slf4j-api = { strictly = "2.0.16" }

# Google versions
# https://android.googlesource.com/platform/external/protobuf/+/refs/tags/android-15.0.0_r1/java/pom.xml#7
# https://android.googlesource.com/platform/external/protobuf/+/refs/tags/android-14.0.0_r53/java/pom.xml#7
protobuf = { strictly = "3.21.12" }
# https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-15.0.0_r1/current/extras/material-design-x/Android.bp#7
material = { strictly = "1.11.0" }
# https://android.googlesource.com/platform/prebuilts/sdk/+/refs/tags/android-14.0.0_r53/current/extras/material-design-x/Android.bp#15
material = { strictly = "1.7.0-alpha03" }
# careful with upgrading tink, so old backups continue to be decryptable
# https://github.com/tink-crypto/tink-java/releases
tink = { strictly = "1.15.0" }

# Coroutines versions
# https://android.googlesource.com/platform/external/kotlinx.coroutines/+/refs/tags/android-15.0.0_r1/CHANGES.md
# https://android.googlesource.com/platform/external/kotlinx.coroutines/+/refs/tags/android-14.0.0_r53/CHANGES.md
coroutines = { strictly = "1.7.3" } # AOSP has 1.7.2 but several libs require 1.7.3

# AndroidX versions
# https://android.googlesource.com/platform/prebuilts/sdk/+/android-15.0.0_r1/current/androidx/m2repository/androidx/room/room-ktx?autodive=0
room = { strictly = "2.7.0-alpha03" }
# https://android.googlesource.com/platform/prebuilts/sdk/+/android-15.0.0_r1/current/androidx/m2repository/androidx/core/core-ktx?autodive=0
androidx-core = { strictly = "1.14.0-alpha01" }
# https://android.googlesource.com/platform/prebuilts/sdk/+/android-15.0.0_r1/current/androidx/m2repository/androidx/fragment/fragment-ktx?autodive=0
androidx-fragment = { strictly = "1.8.0-rc01" }
# https://android.googlesource.com/platform/prebuilts/sdk/+/android-15.0.0_r1/current/androidx/m2repository/androidx/activity/activity-ktx?autodive=0
androidx-activity = { strictly = "1.9.2" } # 1.10.0-alpha01 in AOSP but has compile SDK version issues
# https://android.googlesource.com/platform/prebuilts/sdk/+/android-14.0.0_r53/current/androidx/m2repository/androidx/room/room-ktx?autodive=0
room = { strictly = "2.7.0-alpha01" }
# https://android.googlesource.com/platform/prebuilts/sdk/+/android-14.0.0_r53/current/androidx/m2repository/androidx/core/core-ktx?autodive=0
androidx-core = { strictly = "1.13.0-beta01" }
# https://android.googlesource.com/platform/prebuilts/sdk/+/android-14.0.0_r53/current/androidx/m2repository/androidx/fragment/fragment-ktx?autodive=0
androidx-fragment = { strictly = "1.7.0-beta01" }
# https://android.googlesource.com/platform/prebuilts/sdk/+/android-14.0.0_r53/current/androidx/m2repository/androidx/activity/activity-ktx?autodive=0
androidx-activity = { strictly = "1.9.0-alpha03" }
# https://android.googlesource.com/platform/prebuilts/sdk/+/android-14.0.0_r29/current/androidx/m2repository/androidx/preference/preference?autodive=0
androidx-preference = { strictly = "1.2.0-alpha01" } # 1.3.0-alpha01 in AOSP but isn't released
# https://android.googlesource.com/platform/prebuilts/sdk/+/android-15.0.0_r1/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-ktx?autodive=0
androidx-lifecycle-viewmodel-ktx = { strictly = "2.9.0-alpha01" }
androidx-lifecycle-livedata-ktx = { strictly = "2.9.0-alpha01" }
# https://android.googlesource.com/platform/prebuilts/sdk/+/android-15.0.0_r1/current/androidx/m2repository/androidx/constraintlayout/constraintlayout?autodive=0
# https://android.googlesource.com/platform/prebuilts/sdk/+/android-14.0.0_r53/current/androidx/m2repository/androidx/lifecycle/lifecycle-viewmodel-ktx?autodive=0
androidx-lifecycle-viewmodel-ktx = { strictly = "2.8.0-alpha02" }
androidx-lifecycle-livedata-ktx = { strictly = "2.8.0-alpha02" }
# https://android.googlesource.com/platform/prebuilts/sdk/+/android-14.0.0_r53/current/androidx/m2repository/androidx/constraintlayout/constraintlayout?autodive=0
androidx-constraintlayout = { strictly = "2.2.0-alpha13" }
# https://android.googlesource.com/platform/prebuilts/sdk/+/android-15.0.0_r1/current/androidx/m2repository/androidx/documentfile/documentfile?autodive=0
# https://android.googlesource.com/platform/prebuilts/sdk/+/android-14.0.0_r53/current/androidx/m2repository/androidx/documentfile/documentfile?autodive=0
androidx-documentfile = { strictly = "1.1.0-alpha01" } # 1.1.0-alpha02 in AOSP but isn't released
# https://android.googlesource.com/platform/prebuilts/sdk/+/android-15.0.0_r1/current/androidx/m2repository/androidx/work/work-runtime-ktx?autodive=0
androidx-work-runtime = { strictly = "2.10.0-alpha02" }
# https://android.googlesource.com/platform/prebuilts/sdk/+/android-14.0.0_r53/current/androidx/m2repository/androidx/work/work-runtime-ktx?autodive=0
androidx-work-runtime = { strictly = "2.10.0-alpha01" }

# https://android.googlesource.com/platform/external/okio/+/refs/tags/android-14.0.0_r53/CHANGELOG.md
squareup-okio = { strictly = "3.7.0" }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#Mon Sep 09 11:23:59 IST 2024
#Thu May 30 09:49:42 IST 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=5b9c5eb3f9fc2c94abaea57d90bd78747ca117ddbbf96c859d3741181a12bf2a
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Binary file modified libs/aosp/android.jar
View file
Open in desktop
Binary file not shown.
Binary file modified libs/aosp/libcore.jar
View file
Open in desktop
Binary file not shown.