Skip to content

armgit / ente

Public Imported from GitHub
0

💚 End-to-end encrypted cloud for everything.

Target Android API 36

Manav Rathi0831bd77d305
diff --git a/mobile/native/android/apps/ensu/app/build.gradle.kts b/mobile/native/android/apps/ensu/app/build.gradle.kts
index 115a37a36e..6f44385b1e 100644
--- a/mobile/native/android/apps/ensu/app/build.gradle.kts
+++ b/mobile/native/android/apps/ensu/app/build.gradle.kts
@@ -54,7 +54,7 @@ val debugAbis = listOf(connectedDeviceAbi() ?: hostAbi())
android {
namespace = "io.ente.ensu"
- compileSdk = 35
+ compileSdk = 36
signingConfigs {
create("release") {
@@ -75,7 +75,7 @@ android {
defaultConfig {
applicationId = "io.ente.ensu"
minSdk = 24
- targetSdk = 35
+ targetSdk = 36
versionCode = (project.findProperty("versionCode") as? String)?.toInt() ?: 33
versionName = "0.1.18"
}
diff --git a/mobile/native/android/apps/ensu/build.gradle.kts b/mobile/native/android/apps/ensu/build.gradle.kts
index c3918bb0e9..bf1cdb8b92 100644
--- a/mobile/native/android/apps/ensu/build.gradle.kts
+++ b/mobile/native/android/apps/ensu/build.gradle.kts
@@ -1,6 +1,6 @@
plugins {
- id("com.android.application") version "8.7.3" apply false
- id("com.android.library") version "8.7.3" apply false
+ id("com.android.application") version "8.10.1" apply false
+ id("com.android.library") version "8.10.1" apply false
id("org.jetbrains.kotlin.android") version "1.9.23" apply false
id("org.jetbrains.kotlin.jvm") version "1.9.23" apply false
id("org.jetbrains.kotlin.plugin.serialization") version "1.9.23" apply false
diff --git a/mobile/native/android/apps/ensu/gradle/wrapper/gradle-wrapper.jar b/mobile/native/android/apps/ensu/gradle/wrapper/gradle-wrapper.jar
index 61285a659d..1b33c55baa 100644
Binary files a/mobile/native/android/apps/ensu/gradle/wrapper/gradle-wrapper.jar and b/mobile/native/android/apps/ensu/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/mobile/native/android/apps/ensu/gradle/wrapper/gradle-wrapper.properties b/mobile/native/android/apps/ensu/gradle/wrapper/gradle-wrapper.properties
index dedd5d1e69..4ca99e6a38 100644
--- a/mobile/native/android/apps/ensu/gradle/wrapper/gradle-wrapper.properties
+++ b/mobile/native/android/apps/ensu/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-all.zip
+distributionSha256Sum=62c3769155d7d17ea05084ad498067824c1804568a408a6faa78a5ef95ed67a8
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
diff --git a/mobile/native/android/apps/ensu/gradlew b/mobile/native/android/apps/ensu/gradlew
index adff685a03..23d15a9367 100755
--- a/mobile/native/android/apps/ensu/gradlew
+++ b/mobile/native/android/apps/ensu/gradlew
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# Copyright © 2015 the original authors.
+# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -114,6 +114,7 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac
+CLASSPATH="\\\"\\\""
# Determine the Java command to use to start the JVM.
@@ -171,6 +172,7 @@ fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" )
@@ -210,6 +212,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@"
diff --git a/mobile/native/android/apps/ensu/gradlew.bat b/mobile/native/android/apps/ensu/gradlew.bat
index e509b2dd8f..5eed7ee845 100644
--- a/mobile/native/android/apps/ensu/gradlew.bat
+++ b/mobile/native/android/apps/ensu/gradlew.bat
@@ -70,10 +70,11 @@ goto fail
:execute
@rem Setup the command line
+set CLASSPATH=
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
:end
@rem End local scope for the variables with windows NT shell
diff --git a/mobile/native/android/apps/ensu/rust/build.gradle.kts b/mobile/native/android/apps/ensu/rust/build.gradle.kts
index 64171d8dca..1c983d289f 100644
--- a/mobile/native/android/apps/ensu/rust/build.gradle.kts
+++ b/mobile/native/android/apps/ensu/rust/build.gradle.kts
@@ -98,7 +98,7 @@ val buildRustJniRelease = registerBuildRustJni(
android {
namespace = "io.ente.ensu.rust"
- compileSdk = 34
+ compileSdk = 36
// Pin the NDK instead of relying on AGP defaults. GitHub-hosted Ubuntu
// runners already ship 27.3.13750724, so this keeps CI lean while making
// the requirement explicit for local builds too.