Skip to content

Commit 1583544

Browse files
authored
fix: plugin-migration-v4-to-v5​ (#284)
1 parent da20a1e commit 1583544

File tree

2 files changed

+17
-8
lines changed

2 files changed

+17
-8
lines changed

android/build.gradle

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
ext {
2+
junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
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'
6+
}
7+
18
buildscript {
29
repositories {
310
jcenter()
@@ -13,10 +20,10 @@ apply plugin: 'com.android.library'
1320

1421
android {
1522
namespace "com.codetrixstudio.capacitor.GoogleAuth.capacitorgoogleauth"
16-
compileSdkVersion 32
23+
compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 33
1724
defaultConfig {
18-
minSdkVersion 22
19-
targetSdkVersion 32
25+
minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
26+
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 33
2027
versionCode 1
2128
versionName "1.0"
2229
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -46,10 +53,9 @@ repositories {
4653
dependencies {
4754
implementation fileTree(dir: 'libs', include: ['*.jar'])
4855
implementation project(':capacitor-android')
49-
implementation 'androidx.appcompat:appcompat:1.2.0'
50-
testImplementation 'junit:junit:4.13'
51-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
52-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
56+
implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
57+
testImplementation "junit:junit:$junitVersion"
58+
androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
59+
androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
5360
implementation 'com.google.android.gms:play-services-auth:18.+'
5461
}
55-

android/gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,6 @@ org.gradle.jvmargs=-Xmx1536m
1515
# This option should only be used with decoupled projects. More details, visit
1616
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1717
# org.gradle.parallel=true
18+
19+
# Supports AndroidX
20+
android.useAndroidX=true

0 commit comments

Comments
 (0)