diff --git a/apps/example-app-spm/ios/App/App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/apps/example-app-spm/ios/App/App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 4c20ad1e..bf1c40fd 100644 --- a/apps/example-app-spm/ios/App/App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/apps/example-app-spm/ios/App/App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,13 +1,13 @@ { - "originHash" : "cced83d6d979b4feabdde112bf90a587946dc5819231f7aa487539ce13becc3d", + "originHash" : "799a505df10b216fc01825855aec8cd3c2d04e3d7b4928e7dab033054e423f52", "pins" : [ { "identity" : "capacitor-swift-pm", "kind" : "remoteSourceControl", "location" : "https://github.com/ionic-team/capacitor-swift-pm.git", "state" : { - "revision" : "596259033e94829dffc552a40e7129262122995e", - "version" : "8.0.0" + "revision" : "d72bb9e9e4b80e5c7f41ee3bf0d95008ab7dcfd8", + "version" : "9.0.0-alpha.6" } } ], diff --git a/packages/android-js-engine/AndroidJSEngine/build.gradle b/packages/android-js-engine/AndroidJSEngine/build.gradle index 2246ddb4..8c52e065 100644 --- a/packages/android-js-engine/AndroidJSEngine/build.gradle +++ b/packages/android-js-engine/AndroidJSEngine/build.gradle @@ -5,34 +5,28 @@ ext { androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.1' androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.3.0' androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.7.0' - androidxCoreKTXVersion = project.hasProperty('androidxCoreKTXVersion') ? rootProject.ext.androidxCoreKTXVersion : '1.17.0' - androidxMaterialVersion = project.hasProperty('androidxMaterialVersion') ? rootProject.ext.androidxMaterialVersion : '1.13.0' + androidxCoreVersion = project.hasProperty('androidxCoreVersion') ? rootProject.ext.androidxCoreVersion : '1.19.0' } buildscript { - ext.kotlin_version = project.hasProperty("kotlin_version") ? rootProject.ext.kotlin_version : '2.2.20' - repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.13.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath 'com.android.tools.build:gradle:9.2.1' } } apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' android { namespace = 'com.capacitorjs.android_js_engine' - compileSdk = 36 + compileSdk = 37 ndkVersion = "28.2.13676358" defaultConfig { - minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 24 - targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 36 + minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 26 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" @@ -72,9 +66,8 @@ kotlin { } dependencies { - implementation "androidx.core:core-ktx:$androidxCoreKTXVersion" + implementation "androidx.core:core:$androidxCoreVersion" implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion" - implementation "com.google.android.material:material:$androidxMaterialVersion" testImplementation "junit:junit:$junitVersion" androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion" androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion" diff --git a/packages/android-js-engine/app/build.gradle b/packages/android-js-engine/app/build.gradle index c81cdbbe..fa6531e7 100644 --- a/packages/android-js-engine/app/build.gradle +++ b/packages/android-js-engine/app/build.gradle @@ -2,17 +2,15 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { id 'com.android.application' - id 'org.jetbrains.kotlin.android' } android { namespace = 'io.ionic.android_js_engine_testproject' - compileSdk = 36 + compileSdk = 37 defaultConfig { applicationId "io.ionic.android_js_engine_testproject" - minSdk 24 - targetSdk 36 + minSdk 26 versionCode 1 versionName "1.0" @@ -39,9 +37,9 @@ kotlin { dependencies { implementation project(path: ':AndroidJSEngine') - implementation 'androidx.core:core-ktx:1.17.0' + implementation 'androidx.core:core:1.19.0' implementation 'androidx.appcompat:appcompat:1.7.1' - implementation 'com.google.android.material:material:1.13.0' + implementation 'com.google.android.material:material:1.14.0' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.3.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0' diff --git a/packages/android-js-engine/build.gradle b/packages/android-js-engine/build.gradle index b5d83626..9a2c2eac 100644 --- a/packages/android-js-engine/build.gradle +++ b/packages/android-js-engine/build.gradle @@ -1,6 +1,5 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '8.13.0' apply false - id 'com.android.library' version '8.13.0' apply false - id 'org.jetbrains.kotlin.android' version '2.2.20' apply false + id 'com.android.application' version '9.2.1' apply false + id 'com.android.library' version '9.2.1' apply false } \ No newline at end of file diff --git a/packages/android-js-engine/gradle/wrapper/gradle-wrapper.properties b/packages/android-js-engine/gradle/wrapper/gradle-wrapper.properties index 2906fadc..a70d73cb 100644 --- a/packages/android-js-engine/gradle/wrapper/gradle-wrapper.properties +++ b/packages/android-js-engine/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,8 @@ -#Fri Jan 05 16:19:19 CST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-all.zip +networkTimeout=60000 +retryBackOffMs=200 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists 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 a3798a54..2ff2bfdf 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