Skip to content

Commit e46c3e4

Browse files
authored
fix: update cap #8685c6y2h (#16)
1 parent 7e25c68 commit e46c3e4

File tree

5 files changed

+39
-1648
lines changed

5 files changed

+39
-1648
lines changed

android/build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ext {
22
junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
3-
androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.4.2'
4-
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.3'
5-
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.4.0'
3+
androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.6.1'
4+
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.5'
5+
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1'
66
}
77

88
buildscript {
@@ -18,7 +18,7 @@ buildscript {
1818
maven { url "https://jitpack.io" }
1919
}
2020
dependencies {
21-
classpath 'com.android.tools.build:gradle:7.2.1'
21+
classpath 'com.android.tools.build:gradle:8.0.0'
2222
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
2323
}
2424
}
@@ -29,10 +29,10 @@ apply plugin: 'kotlin-parcelize'
2929

3030
android {
3131
namespace "com.resgrid.plugins.resgrid"
32-
compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 32
32+
compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 33
3333
defaultConfig {
3434
minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
35-
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 32
35+
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 33
3636
versionCode 1
3737
versionName "1.0"
3838
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -47,8 +47,8 @@ android {
4747
abortOnError false
4848
}
4949
compileOptions {
50-
sourceCompatibility JavaVersion.VERSION_11
51-
targetCompatibility JavaVersion.VERSION_11
50+
sourceCompatibility JavaVersion.VERSION_17
51+
targetCompatibility JavaVersion.VERSION_17
5252
}
5353
buildFeatures {
5454
viewBinding = true
@@ -66,7 +66,7 @@ dependencies {
6666
implementation fileTree(dir: 'libs', include: ['*.jar'])
6767
implementation project(':capacitor-android')
6868
implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
69-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
69+
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
7070
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${coroutinesVersion}"
7171
implementation 'com.google.android.material:material:1.6.1'
7272
implementation 'androidx.appcompat:appcompat:1.4.2'

android/gradle.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,4 @@ org.gradle.jvmargs=-Xmx1536m
2020
# Android operating system, and which are packaged with your app's APK
2121
# https://developer.android.com/topic/libraries/support-library/androidx-rn
2222
android.useAndroidX=true
23-
# Automatically convert third-party libraries to use AndroidX
24-
android.enableJetifier=true
23+
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)