diff --git a/packages/android-js-engine/AndroidJSEngine/build.gradle b/packages/android-js-engine/AndroidJSEngine/build.gradle index 759bbbf8..fbbb7492 100644 --- a/packages/android-js-engine/AndroidJSEngine/build.gradle +++ b/packages/android-js-engine/AndroidJSEngine/build.gradle @@ -25,13 +25,11 @@ apply plugin: 'kotlin-android' android { namespace 'com.capacitorjs.android_js_engine' - compileSdk 33 + compileSdk 34 defaultConfig { minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22 - targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 33 - versionCode 1 - versionName "1.0" + targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 34 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" diff --git a/packages/android-js-engine/build.gradle b/packages/android-js-engine/build.gradle index 7c8e737b..1ccaefec 100644 --- a/packages/android-js-engine/build.gradle +++ b/packages/android-js-engine/build.gradle @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '8.0.2' apply false - id 'com.android.library' version '8.0.2' apply false + id 'com.android.application' version '8.2.1' apply false + id 'com.android.library' version '8.2.1' apply false id 'org.jetbrains.kotlin.android' version '1.9.10' apply false } \ No newline at end of file diff --git a/packages/capacitor-plugin/android/build.gradle b/packages/capacitor-plugin/android/build.gradle index 0642d1f4..0a9ff751 100644 --- a/packages/capacitor-plugin/android/build.gradle +++ b/packages/capacitor-plugin/android/build.gradle @@ -26,10 +26,10 @@ apply plugin: 'org.jetbrains.kotlin.android' android { namespace "com.capacitorjs.plugins.backgroundrunner" - compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 33 + compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 34 defaultConfig { minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22 - targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 33 + targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 34 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/packages/capacitor-plugin/android/gradle/wrapper/gradle-wrapper.jar b/packages/capacitor-plugin/android/gradle/wrapper/gradle-wrapper.jar index ccebba77..033e24c4 100644 Binary files a/packages/capacitor-plugin/android/gradle/wrapper/gradle-wrapper.jar and b/packages/capacitor-plugin/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/packages/capacitor-plugin/android/gradle/wrapper/gradle-wrapper.properties b/packages/capacitor-plugin/android/gradle/wrapper/gradle-wrapper.properties index 9b0a13f0..c747538f 100644 --- a/packages/capacitor-plugin/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/capacitor-plugin/android/gradle/wrapper/gradle-wrapper.properties @@ -2,5 +2,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/capacitor-plugin/android/gradlew b/packages/capacitor-plugin/android/gradlew index 79a61d42..fcb6fca1 100755 --- a/packages/capacitor-plugin/android/gradlew +++ b/packages/capacitor-plugin/android/gradlew @@ -85,9 +85,6 @@ done APP_BASE_NAME=${0##*/} APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,10 +130,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. @@ -197,6 +197,10 @@ if "$cygwin" || "$msys" ; then done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in diff --git a/packages/capacitor-plugin/android/src/main/libs/android-js-engine-release.aar b/packages/capacitor-plugin/android/src/main/libs/android-js-engine-release.aar index ce7f3a73..17a96fdd 100644 Binary files a/packages/capacitor-plugin/android/src/main/libs/android-js-engine-release.aar and b/packages/capacitor-plugin/android/src/main/libs/android-js-engine-release.aar differ