Skip to content

Commit 09a7d66

Browse files
authored
chore(example-app): migrate to Capacitor 9 alpha (#34)
1 parent 0c226be commit 09a7d66

15 files changed

Lines changed: 11418 additions & 62 deletions

example-app/android/app/build.gradle

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ android {
66
defaultConfig {
77
applicationId "io.ionic.starter"
88
minSdkVersion rootProject.ext.minSdkVersion
9-
targetSdkVersion rootProject.ext.targetSdkVersion
109
versionCode 1
1110
versionName "1.0"
1211
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -19,17 +18,11 @@ android {
1918
buildTypes {
2019
release {
2120
minifyEnabled false
22-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
21+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
2322
}
2423
}
2524
}
2625

27-
repositories {
28-
flatDir{
29-
dirs '../capacitor-cordova-android-plugins/src/main/libs', 'libs'
30-
}
31-
}
32-
3326
dependencies {
3427
implementation fileTree(include: ['*.jar'], dir: 'libs')
3528
implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
@@ -39,7 +32,6 @@ dependencies {
3932
testImplementation "junit:junit:$junitVersion"
4033
androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
4134
androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
42-
implementation project(':capacitor-cordova-android-plugins')
4335
}
4436

4537
apply from: 'capacitor.build.gradle'

example-app/android/app/capacitor.build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ android {
77
}
88
}
99

10-
apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
1110
dependencies {
1211
implementation project(':capacitor-app')
1312
implementation project(':capacitor-haptics')

example-app/android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ buildscript {
77
mavenCentral()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:8.13.0'
11-
classpath 'com.google.gms:google-services:4.4.4'
10+
classpath 'com.android.tools.build:gradle:9.2.1'
11+
classpath 'com.google.gms:google-services:4.5.0'
1212

1313
// NOTE: Do not place your application dependencies here; they belong
1414
// in the individual module build.gradle files

example-app/android/capacitor.settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
include ':capacitor-android'
33
project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
44

5+
56
include ':capacitor-app'
67
project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android')
78

4.59 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-all.zip
44
networkTimeout=10000
5+
retries=0
6+
retryBackOffMs=500
57
validateDistributionUrl=true
68
zipStoreBase=GRADLE_USER_HOME
79
zipStorePath=wrapper/dists

example-app/android/gradlew

Lines changed: 2 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example-app/android/gradlew.bat

Lines changed: 10 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
include ':app'
2-
include ':capacitor-cordova-android-plugins'
3-
project(':capacitor-cordova-android-plugins').projectDir = new File('./capacitor-cordova-android-plugins/')
42

53
apply from: 'capacitor.settings.gradle'
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
ext {
2-
minSdkVersion = 24
3-
compileSdkVersion = 36
4-
targetSdkVersion = 36
5-
androidxActivityVersion = '1.9.2'
2+
minSdkVersion = 26
3+
compileSdkVersion = 37
4+
targetSdkVersion = 37
5+
androidxActivityVersion = '1.13.0'
66
androidxAppCompatVersion = '1.7.1'
77
androidxCoordinatorLayoutVersion = '1.3.0'
8-
androidxCoreVersion = '1.15.0'
9-
androidxFragmentVersion = '1.8.4'
8+
androidxCoreVersion = '1.19.0'
9+
androidxFragmentVersion = '1.8.9'
1010
coreSplashScreenVersion = '1.2.0'
11-
androidxWebkitVersion = '1.12.1'
11+
androidxWebkitVersion = '1.16.0'
1212
junitVersion = '4.13.2'
1313
androidxJunitVersion = '1.3.0'
1414
androidxEspressoCoreVersion = '3.7.0'
15-
cordovaAndroidVersion = '10.1.1'
15+
cordovaAndroidVersion = '15.0.0'
1616
}

0 commit comments

Comments
 (0)