nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-25 22:01:16 +00:00
Code Releases Activity

Bump SDK to 32 (#1896)

Browse source 
This is just a "minor" upgrade for android "12L" - some tablet related
improvements we likely don't care about. This bump is to support a contribution
to migrate our UI from something legacy to an up-to-date default framework that
requires >=32.
This commit is contained in:
Simon Frei 2023-03-26 18:40:00 +02:00 committed by GitHub
parent b0c811d213
commit f0762bab12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/build.gradle
View file

@ -26,8 +26,8 @@ dependencies {
android { android {
// Changes to these values need to be reflected in `../docker/Dockerfile` // Changes to these values need to be reflected in `../docker/Dockerfile`
compileSdkVersion 31 compileSdkVersion 32
buildToolsVersion '31.0.0' buildToolsVersion '32.0.0'
ndkVersion = "${ndkVersionShared}" ndkVersion = "${ndkVersionShared}"
buildTypes.debug.applicationIdSuffix ".debug" buildTypes.debug.applicationIdSuffix ".debug"
@ -36,7 +36,7 @@ android {
defaultConfig { defaultConfig {
applicationId "com.nutomic.syncthingandroid" applicationId "com.nutomic.syncthingandroid"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 31 targetSdkVersion 32
versionCode 4337 versionCode 4337
versionName "1.23.3-rc.1" versionName "1.23.3-rc.1"
testApplicationId 'com.nutomic.syncthingandroid.test' testApplicationId 'com.nutomic.syncthingandroid.test'

2
docker/Dockerfile
View file

@ -30,7 +30,7 @@ RUN yes | $SDKMANAGER --licenses > /dev/null
ENV NDK_VERSION 25.1.8937393 ENV NDK_VERSION 25.1.8937393
# Install other android packages, including NDK # Install other android packages, including NDK
RUN $SDKMANAGER tools platform-tools "build-tools;31.0.0" "platforms;android-31" "extras;android;m2repository" "ndk;${NDK_VERSION}" RUN $SDKMANAGER tools platform-tools "build-tools;32.0.0" "platforms;android-32" "extras;android;m2repository" "ndk;${NDK_VERSION}"
# Accept licenses of newly installed packages # Accept licenses of newly installed packages
RUN yes | $SDKMANAGER --licenses RUN yes | $SDKMANAGER --licenses

2
docker/prebuild.sh
View file

@ -5,6 +5,6 @@
echo "Prepopulating gradle and go build/pkg cache" echo "Prepopulating gradle and go build/pkg cache"
git clone --recurse-submodules https://github.com/syncthing/syncthing-android git clone --recurse-submodules https://github.com/syncthing/syncthing-android
cd syncthing-android cd syncthing-android
./gradlew --no-daemon lint buildNative ./gradlew --no-daemon lint build
cd .. cd ..
rm -rf syncthing-android rm -rf syncthing-android