Skip to content

Commit c2ac018

Browse files
jcesarmobilejcesarmobile
authored
chore: migrate to Capacitor 6 (#657)
1 parent 2fc1f22 commit c2ac018

11 files changed

Lines changed: 2398 additions & 1722 deletions

File tree

‎android/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22

33
android {
44
namespace "com.capacitorjs.app.testapp"
5-
compileSdkVersion rootProject.ext.compileSdkVersion
5+
compileSdk rootProject.ext.compileSdkVersion
66
defaultConfig {
77
applicationId "com.capacitorjs.app.testapp"
88
minSdkVersion rootProject.ext.minSdkVersion

‎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.0.0'
11-
classpath 'com.google.gms:google-services:4.3.15'
10+
classpath 'com.android.tools.build:gradle:8.2.1'
11+
classpath 'com.google.gms:google-services:4.4.0'
1212

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

‎android/gradle/wrapper/gradle-wrapper.jar‎

1.73 KB
Binary file not shown.

‎android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

‎android/gradlew‎

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

‎android/variables.gradle‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
ext {
22
minSdkVersion = 22
3-
compileSdkVersion = 33
4-
targetSdkVersion = 33
5-
androidxActivityVersion = '1.7.0'
3+
compileSdkVersion = 34
4+
targetSdkVersion = 34
5+
androidxActivityVersion = '1.8.0'
66
androidxAppCompatVersion = '1.6.1'
77
androidxCoordinatorLayoutVersion = '1.2.0'
8-
androidxCoreVersion = '1.10.0'
9-
androidxBrowserVersion = '1.5.0'
10-
androidxFragmentVersion = '1.5.6'
11-
androidxMaterialVersion = '1.8.0'
8+
androidxCoreVersion = '1.12.0'
9+
androidxBrowserVersion = '1.7.0'
10+
androidxFragmentVersion = '1.6.2'
11+
androidxMaterialVersion = '1.10.0'
1212
androidxExifInterfaceVersion = '1.3.6'
13-
firebaseMessagingVersion = '23.1.2'
14-
playServicesLocationVersion = '21.0.1'
13+
firebaseMessagingVersion = '23.3.1'
14+
playServicesLocationVersion = '21.1.0'
1515
junitVersion = '4.13.2'
1616
androidxJunitVersion = '1.1.5'
1717
androidxEspressoCoreVersion = '3.5.1'
1818
cordovaAndroidVersion = '10.1.1'
19-
coreSplashScreenVersion = '1.0.0'
20-
androidxWebkitVersion = '1.6.1'
19+
coreSplashScreenVersion = '1.0.1'
20+
androidxWebkitVersion = '1.9.0'
2121
}

‎ios/App/App/Info.plist‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
<true/>
3838
<key>NSCameraUsageDescription</key>
3939
<string>To Take Photos and Video</string>
40-
<key>NSLocationAlwaysUsageDescription</key>
41-
<string>Always allow Geolocation?</string>
4240
<key>NSLocationWhenInUseUsageDescription</key>
4341
<string>Allow Geolocation?</string>
4442
<key>NSMicrophoneUsageDescription</key>

‎ios/App/App/capacitor.config.json‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,30 @@
2222
"sound"
2323
]
2424
}
25-
}
25+
},
26+
"packageClassList": [
27+
"ActionSheetPlugin",
28+
"AppPlugin",
29+
"AppLauncherPlugin",
30+
"CAPBrowserPlugin",
31+
"CAPCameraPlugin",
32+
"ClipboardPlugin",
33+
"DevicePlugin",
34+
"DialogPlugin",
35+
"FilesystemPlugin",
36+
"GeolocationPlugin",
37+
"HapticsPlugin",
38+
"KeyboardPlugin",
39+
"LocalNotificationsPlugin",
40+
"CAPNetworkPlugin",
41+
"PreferencesPlugin",
42+
"PushNotificationsPlugin",
43+
"ScreenOrientationPlugin",
44+
"ScreenReaderPlugin",
45+
"SharePlugin",
46+
"SplashScreenPlugin",
47+
"StatusBarPlugin",
48+
"TextZoomPlugin",
49+
"ToastPlugin"
50+
]
2651
}

‎ios/App/Podfile.lock‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
11
PODS:
2-
- Capacitor (5.0.2):
2+
- Capacitor (6.0.0):
33
- CapacitorCordova
4-
- CapacitorActionSheet (5.0.2):
4+
- CapacitorActionSheet (6.0.0):
55
- Capacitor
6-
- CapacitorApp (5.0.2):
6+
- CapacitorApp (6.0.0):
77
- Capacitor
8-
- CapacitorAppLauncher (5.0.2):
8+
- CapacitorAppLauncher (6.0.0):
99
- Capacitor
10-
- CapacitorBrowser (5.0.2):
10+
- CapacitorBrowser (6.0.0):
1111
- Capacitor
12-
- CapacitorCamera (5.0.2):
12+
- CapacitorCamera (6.0.0):
1313
- Capacitor
14-
- CapacitorClipboard (5.0.2):
14+
- CapacitorClipboard (6.0.0):
1515
- Capacitor
16-
- CapacitorCordova (5.0.2)
17-
- CapacitorDevice (5.0.2):
16+
- CapacitorCordova (6.0.0)
17+
- CapacitorDevice (6.0.0):
1818
- Capacitor
19-
- CapacitorDialog (5.0.2):
19+
- CapacitorDialog (6.0.0):
2020
- Capacitor
21-
- CapacitorFilesystem (5.0.2):
21+
- CapacitorFilesystem (6.0.0):
2222
- Capacitor
23-
- CapacitorGeolocation (5.0.2):
23+
- CapacitorGeolocation (6.0.0):
2424
- Capacitor
25-
- CapacitorHaptics (5.0.2):
25+
- CapacitorHaptics (6.0.0):
2626
- Capacitor
27-
- CapacitorKeyboard (5.0.2):
27+
- CapacitorKeyboard (6.0.0):
2828
- Capacitor
29-
- CapacitorLocalNotifications (5.0.2):
29+
- CapacitorLocalNotifications (6.0.0):
3030
- Capacitor
31-
- CapacitorNetwork (5.0.2):
31+
- CapacitorNetwork (6.0.0):
3232
- Capacitor
33-
- CapacitorPreferences (5.0.2):
33+
- CapacitorPreferences (6.0.0):
3434
- Capacitor
35-
- CapacitorPushNotifications (5.0.2):
35+
- CapacitorPushNotifications (6.0.0):
3636
- Capacitor
37-
- CapacitorScreenOrientation (5.0.2):
37+
- CapacitorScreenOrientation (6.0.0):
3838
- Capacitor
39-
- CapacitorScreenReader (5.0.2):
39+
- CapacitorScreenReader (6.0.0):
4040
- Capacitor
41-
- CapacitorShare (5.0.2):
41+
- CapacitorShare (6.0.0):
4242
- Capacitor
43-
- CapacitorSplashScreen (5.0.2):
43+
- CapacitorSplashScreen (6.0.0):
4444
- Capacitor
45-
- CapacitorStatusBar (5.0.2):
45+
- CapacitorStatusBar (6.0.0):
4646
- Capacitor
47-
- CapacitorTextZoom (5.0.2):
47+
- CapacitorTextZoom (6.0.0):
4848
- Capacitor
49-
- CapacitorToast (5.0.2):
49+
- CapacitorToast (6.0.0):
5050
- Capacitor
5151
- Firebase/CoreOnly (9.5.0):
5252
- FirebaseCore (= 9.5.0)
@@ -201,31 +201,31 @@ EXTERNAL SOURCES:
201201
:path: "../../node_modules/@capacitor/toast"
202202

203203
SPEC CHECKSUMS:
204-
Capacitor: d703b5dde0a7d82df29aa4323845709df29c96a8
205-
CapacitorActionSheet: 5f96ede9bde29ba734a5a31b70cfdaaa7855689f
206-
CapacitorApp: 28fef1fd75b2b3686e875216806fb8416d421097
207-
CapacitorAppLauncher: 222eb443f90379a47bd84c8b3ed8ec47fa7e236f
208-
CapacitorBrowser: 7986ee35377383fc40f7c1a0a793e0d9a49fe527
209-
CapacitorCamera: 15face5f9e030e480929a2c989deaaf3eb0d3947
210-
CapacitorClipboard: a198f34cd0ed4d1777da5edae13445227ec05be3
211-
CapacitorCordova: 9745ab233fe489f3315154b7969deea3ce1b4e85
212-
CapacitorDevice: 980e172f6fbfa0a945c73f908adc74b5a031e7d4
213-
CapacitorDialog: 01c49f7f4b37e7ad59e38fd317a6e5f006f23cdc
214-
CapacitorFilesystem: 3a7bb944feb5b7e9473adeb08662c73141510aa8
215-
CapacitorGeolocation: 8532cd1585dbf0b5b721fa65ea51a36bf9a71e92
216-
CapacitorHaptics: 864585542a435bd41eaabf7f30d9ff5ec03024d3
217-
CapacitorKeyboard: e628d4e66d621c69e449945ebabded17c5b9c2e8
218-
CapacitorLocalNotifications: db01feb38f85b4fd8c0a0d0fa94a4a6410239563
219-
CapacitorNetwork: 77c00ce41b4e014cbc6fdcb233462e7fce4b4755
220-
CapacitorPreferences: 0ad8838944f900284900d9647d9b0145c89ca27d
221-
CapacitorPushNotifications: 0566429afa72fe083a4142a58321f0ad83837096
222-
CapacitorScreenOrientation: d45f5fca4f31a4da15bfe54bd5d4a772e3d726b3
223-
CapacitorScreenReader: c3ac63145683b8e1a52c7217757eedfaec47dc53
224-
CapacitorShare: 931224a0e17615e799d35b26286ab1d05f37d8fb
225-
CapacitorSplashScreen: bd2a056394ba0b8807e7bb3e746424f67c426e03
226-
CapacitorStatusBar: 48f2899f6846cc7d8431b251ebfc58e1c10e3d58
227-
CapacitorTextZoom: 3600e003d8847b4588f500dae23d7962b4639c19
228-
CapacitorToast: d785c9169585b9267b8392094298de7cb0eaa16e
204+
Capacitor: 559d073c4ca6c27f8e7002c807eea94c3ba435a9
205+
CapacitorActionSheet: de123f478f394373f84a96614ce2b1a6c30253e4
206+
CapacitorApp: 9d53aec7101f7b030a950c5bdc4df8612576b279
207+
CapacitorAppLauncher: 24ce4be152a84883378d22114ffe6c492056ced2
208+
CapacitorBrowser: 7e1e2cdbb3e372f09f0bad0c4c21a6d187b679ad
209+
CapacitorCamera: b61f125d92a0ef75d7becb7956fed7dd13187ee0
210+
CapacitorClipboard: 80282f684154124b9019ebf401235b70b0cf4994
211+
CapacitorCordova: 8c4bfdf69368512e85b1d8b724dd7546abeb30af
212+
CapacitorDevice: f8fd88f9edd1261c55a109f32015b09bbbfdc4a0
213+
CapacitorDialog: 64aa82840ee5e9c066f9e1a49c1e186afd3f24d2
214+
CapacitorFilesystem: 60e59ba274c234a979e7a3be2552feaadcee4263
215+
CapacitorGeolocation: 1f12bbe372b65116e851bd8e3a94cf0ef9bacebb
216+
CapacitorHaptics: 9ebc9363f0e9b8eb4295088a0b474530acf1859b
217+
CapacitorKeyboard: deacbd09d8d1029c3681197fb05d206b721d5f73
218+
CapacitorLocalNotifications: 4ab68f0be5f697a579558fadd307d823a9ec1c26
219+
CapacitorNetwork: f15a94c16a33cba7c47a17814cb6bcfe3ea34ded
220+
CapacitorPreferences: c9b839a80baa72e4ed4bdb117618e1950d3046b5
221+
CapacitorPushNotifications: e18636e8a96f1d70b4c669e21c730e995bf5e5c9
222+
CapacitorScreenOrientation: d78ce2b710bfcd1c32d3a090d32b6686c1c95e4f
223+
CapacitorScreenReader: 039da921b443a37ecf4f3f1b39a8a6869a3f58ce
224+
CapacitorShare: a771200d3b924a5d7ad9d9fecbac517e4c0aa74f
225+
CapacitorSplashScreen: 5431ab8d19c1c6e95777d53bfaa7a36a6c3d94c7
226+
CapacitorStatusBar: 2e4369f99166125435641b1908d05f561eaba6f6
227+
CapacitorTextZoom: 696722e5c479b364f2429584f11ad386d609bd1a
228+
CapacitorToast: ba573a7bc5dfd622e78d5be126a84ee221da4180
229229
Firebase: 800f16f07af493d98d017446a315c27af0552f41
230230
FirebaseCore: 25c0400b670fd1e2f2104349cd3b5dcce8d9418f
231231
FirebaseCoreDiagnostics: 17cbf4e72b1dbd64bfdc33d4b1f07bce4f16f1d8
@@ -239,4 +239,4 @@ SPEC CHECKSUMS:
239239

240240
PODFILE CHECKSUM: 86f679db508b8a11da49e0da2c32ba720465ff26
241241

242-
COCOAPODS: 1.12.1
242+
COCOAPODS: 1.15.2

0 commit comments

Comments
 (0)