File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 11apply plugin : ' com.android.application'
22
33android {
4- compileSdkVersion 28
4+ compileSdkVersion rootProject . ext . compileSdkVersion
55 defaultConfig {
66 applicationId " io.ionic.pg.ng.cap"
7- minSdkVersion 21
8- targetSdkVersion 28
7+ minSdkVersion rootProject . ext . minSdkVersion
8+ targetSdkVersion rootProject . ext . targetSdkVersion
99 versionCode 1
1010 versionName " 1.0"
11- testInstrumentationRunner " android.support .test.runner.AndroidJUnitRunner"
11+ testInstrumentationRunner " androidx .test.runner.AndroidJUnitRunner"
1212 }
1313 buildTypes {
1414 release {
@@ -29,11 +29,11 @@ repositories {
2929
3030dependencies {
3131 implementation fileTree(include : [' *.jar' ], dir : ' libs' )
32- implementation ' com.android.support :appcompat-v7:28.0.0 '
32+ implementation " androidx.appcompat :appcompat: $a ndroidxAppCompatVersion "
3333 implementation project(' :capacitor-android' )
34- testImplementation ' junit:junit:4.12 '
35- androidTestImplementation ' com.android.support. test:runner:1.0.2 '
36- androidTestImplementation ' com.android.support. test.espresso:espresso-core:3.0.2 '
34+ testImplementation " junit:junit:$j unitVersion "
35+ androidTestImplementation " androidx. test.ext:junit: $a ndroidxJunitVersion "
36+ androidTestImplementation " androidx. test.espresso:espresso-core:$a ndroidxEspressoCoreVersion "
3737 implementation project(' :capacitor-cordova-android-plugins' )
3838}
3939
4646 }
4747} catch (Exception e) {
4848 logger. warn(" google-services.json not found, google-services plugin not applied. Push Notifications won't work" )
49- }
49+ }
Original file line number Diff line number Diff line change 1111 android : theme =" @style/AppTheme" >
1212
1313 <activity
14- android : configChanges =" orientation|keyboardHidden|keyboard|screenSize|locale"
14+ android : configChanges =" orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode "
1515 android : name =" io.ionic.pg.ng.cap.MainActivity"
1616 android : label =" @string/title_activity_main"
1717 android : theme =" @style/AppTheme.NoActionBarLaunch"
3232 </activity >
3333
3434 <provider
35- android : name =" android.support.v4 .content.FileProvider"
35+ android : name =" androidx.core .content.FileProvider"
3636 android : authorities =" ${applicationId}.fileprovider"
3737 android : exported =" false"
3838 android : grantUriPermissions =" true" >
Original file line number Diff line number Diff line change 11{
2- "appId" : " io.ionic.pg.ng. cap" ,
3- "appName" : " Photo Gallery Ng Cap" ,
2+ "appId" : " io.ionic.demo. pg.cap.ng " ,
3+ "appName" : " Photo Gallery Cap Ng " ,
44 "bundledWebRuntime" : false ,
55 "npmClient" : " npm" ,
66 "webDir" : " www" ,
Original file line number Diff line number Diff line change 11<?xml version =" 1.0" encoding =" utf-8" ?>
22<paths xmlns : android =" http://schemas.android.com/apk/res/android" >
33 <external-path name =" my_images" path =" ." />
4- </paths >
4+ <cache-path name =" my_cache_images" path =" ." />
5+ </paths >
Original file line number Diff line number Diff line change @@ -7,12 +7,14 @@ buildscript {
77 jcenter()
88 }
99 dependencies {
10- classpath ' com.android.tools.build:gradle:3.3 .2'
10+ classpath ' com.android.tools.build:gradle:3.6 .2'
1111 classpath ' com.google.gms:google-services:4.2.0'
1212
1313 // NOTE: Do not place your application dependencies here; they belong
1414 // in the individual module build.gradle files
1515 }
16+
17+ apply from : " variables.gradle"
1618}
1719
1820allprojects {
Original file line number Diff line number Diff line change 99
1010# Specifies the JVM arguments used for the daemon process.
1111# The setting is particularly useful for tweaking memory settings.
12+ android.enableJetifier =true
13+ android.useAndroidX =true
1214org.gradle.jvmargs =-Xmx1536m
1315
1416# When configured, Gradle will run in incubating parallel mode.
Original file line number Diff line number Diff line change 1- # Tue Jan 30 13:14:22 CST 2018
1+ # Wed Apr 15 16:15:29 CDT 2020
22distributionBase =GRADLE_USER_HOME
33distributionPath =wrapper/dists
44zipStoreBase =GRADLE_USER_HOME
55zipStorePath =wrapper/dists
6- distributionUrl =https\://services.gradle.org/distributions/gradle-4.10.1 -all.zip
6+ distributionUrl =https\://services.gradle.org/distributions/gradle-5.6.4 -all.zip
Original file line number Diff line number Diff line change 1+ ext {
2+ minSdkVersion = 21
3+ compileSdkVersion = 29
4+ targetSdkVersion = 29
5+ androidxAppCompatVersion = ' 1.1.0'
6+ androidxCoreVersion = ' 1.2.0'
7+ androidxMaterialVersion = ' 1.1.0-rc02'
8+ androidxBrowserVersion = ' 1.2.0'
9+ androidxLocalbroadcastmanagerVersion = ' 1.0.0'
10+ firebaseMessagingVersion = ' 20.1.2'
11+ playServicesLocationVersion = ' 17.0.0'
12+ junitVersion = ' 4.12'
13+ androidxJunitVersion = ' 1.1.1'
14+ androidxEspressoCoreVersion = ' 3.2.0'
15+ cordovaAndroidVersion = ' 7.0.0'
16+ }
You can’t perform that action at this time.
0 commit comments