From 80baf2166407750263ece54af781997272d39074 Mon Sep 17 00:00:00 2001 From: Egor Chebotarev Date: Mon, 12 Feb 2024 16:58:36 +0000 Subject: [PATCH] Update capacitor version --- android/build.gradle | 21 ++++++++++--------- android/gradle.properties | 3 +-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- android/src/main/AndroidManifest.xml | 2 +- package.json | 8 +++---- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 09e3005..a1bf803 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,8 +1,8 @@ ext { - junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.1' - androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.2.0' - androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.2' - androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.3.0' + junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2' + androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.6.1' + androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.5' + androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1' } buildscript { @@ -11,17 +11,18 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:8.0.0' } } apply plugin: 'com.android.library' android { - compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 30 + namespace "sa.ihorizon.public.callkitvoip" + compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 33 defaultConfig { - minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 21 - targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 30 + minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22 + targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 33 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -36,8 +37,8 @@ android { abortOnError false } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } } diff --git a/android/gradle.properties b/android/gradle.properties index 0566c22..92710f3 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -20,5 +20,4 @@ org.gradle.jvmargs=-Xmx1536m # Android operating system, and which are packaged with your app's APK # https://developer.android.com/topic/libraries/support-library/androidx-rn android.useAndroidX=true -# Automatically convert third-party libraries to use AndroidX -android.enableJetifier=true + diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 3c4101c..3796d3c 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 26a17b6..721a962 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + > diff --git a/package.json b/package.json index d9c55cd..c38a3f3 100644 --- a/package.json +++ b/package.json @@ -44,10 +44,10 @@ "prepublishOnly": "npm run build" }, "devDependencies": { - "@capacitor/android": "^4.0.0", - "@capacitor/core": "^4.0.0", + "@capacitor/android": "^5.0.0", + "@capacitor/core": "^5.0.0", "@capacitor/docgen": "^0.0.18", - "@capacitor/ios": "^4.0.0", + "@capacitor/ios": "^5.0.0", "@ionic/eslint-config": "^0.3.0", "@ionic/prettier-config": "^1.0.1", "@ionic/swiftlint-config": "^1.1.2", @@ -60,7 +60,7 @@ "typescript": "~4.1.5" }, "peerDependencies": { - "@capacitor/core": "^4.0.0" + "@capacitor/core": "^5.0.0" }, "prettier": "@ionic/prettier-config", "swiftlint": "@ionic/swiftlint-config",