Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: migrate to Capacitor 6 #657

Merged
merged 3 commits into from
Jun 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.application'

android {
namespace "com.capacitorjs.app.testapp"
compileSdkVersion rootProject.ext.compileSdkVersion
compileSdk rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "com.capacitorjs.app.testapp"
minSdkVersion rootProject.ext.minSdkVersion
Expand Down
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.0.0'
classpath 'com.google.gms:google-services:4.3.15'
classpath 'com.android.tools.build:gradle:8.2.1'
classpath 'com.google.gms:google-services:4.4.0'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
Binary file modified android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
12 changes: 8 additions & 4 deletions android/gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,6 @@ done
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum

Expand Down Expand Up @@ -133,10 +130,13 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
Expand Down Expand Up @@ -197,6 +197,10 @@ if "$cygwin" || "$msys" ; then
done
fi


# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
Expand Down
22 changes: 11 additions & 11 deletions android/variables.gradle
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
ext {
minSdkVersion = 22
compileSdkVersion = 33
targetSdkVersion = 33
androidxActivityVersion = '1.7.0'
compileSdkVersion = 34
targetSdkVersion = 34
androidxActivityVersion = '1.8.0'
androidxAppCompatVersion = '1.6.1'
androidxCoordinatorLayoutVersion = '1.2.0'
androidxCoreVersion = '1.10.0'
androidxBrowserVersion = '1.5.0'
androidxFragmentVersion = '1.5.6'
androidxMaterialVersion = '1.8.0'
androidxCoreVersion = '1.12.0'
androidxBrowserVersion = '1.7.0'
androidxFragmentVersion = '1.6.2'
androidxMaterialVersion = '1.10.0'
androidxExifInterfaceVersion = '1.3.6'
firebaseMessagingVersion = '23.1.2'
playServicesLocationVersion = '21.0.1'
firebaseMessagingVersion = '23.3.1'
playServicesLocationVersion = '21.1.0'
junitVersion = '4.13.2'
androidxJunitVersion = '1.1.5'
androidxEspressoCoreVersion = '3.5.1'
cordovaAndroidVersion = '10.1.1'
coreSplashScreenVersion = '1.0.0'
androidxWebkitVersion = '1.6.1'
coreSplashScreenVersion = '1.0.1'
androidxWebkitVersion = '1.9.0'
}
2 changes: 0 additions & 2 deletions ios/App/App/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@
<true/>
<key>NSCameraUsageDescription</key>
<string>To Take Photos and Video</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>Always allow Geolocation?</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Allow Geolocation?</string>
<key>NSMicrophoneUsageDescription</key>
Expand Down
27 changes: 26 additions & 1 deletion ios/App/App/capacitor.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,30 @@
"sound"
]
}
}
},
"packageClassList": [
"ActionSheetPlugin",
"AppPlugin",
"AppLauncherPlugin",
"CAPBrowserPlugin",
"CAPCameraPlugin",
"ClipboardPlugin",
"DevicePlugin",
"DialogPlugin",
"FilesystemPlugin",
"GeolocationPlugin",
"HapticsPlugin",
"KeyboardPlugin",
"LocalNotificationsPlugin",
"CAPNetworkPlugin",
"PreferencesPlugin",
"PushNotificationsPlugin",
"ScreenOrientationPlugin",
"ScreenReaderPlugin",
"SharePlugin",
"SplashScreenPlugin",
"StatusBarPlugin",
"TextZoomPlugin",
"ToastPlugin"
]
}
102 changes: 51 additions & 51 deletions ios/App/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
PODS:
- Capacitor (5.0.2):
- Capacitor (6.0.0):
- CapacitorCordova
- CapacitorActionSheet (5.0.2):
- CapacitorActionSheet (6.0.0):
- Capacitor
- CapacitorApp (5.0.2):
- CapacitorApp (6.0.0):
- Capacitor
- CapacitorAppLauncher (5.0.2):
- CapacitorAppLauncher (6.0.0):
- Capacitor
- CapacitorBrowser (5.0.2):
- CapacitorBrowser (6.0.0):
- Capacitor
- CapacitorCamera (5.0.2):
- CapacitorCamera (6.0.0):
- Capacitor
- CapacitorClipboard (5.0.2):
- CapacitorClipboard (6.0.0):
- Capacitor
- CapacitorCordova (5.0.2)
- CapacitorDevice (5.0.2):
- CapacitorCordova (6.0.0)
- CapacitorDevice (6.0.0):
- Capacitor
- CapacitorDialog (5.0.2):
- CapacitorDialog (6.0.0):
- Capacitor
- CapacitorFilesystem (5.0.2):
- CapacitorFilesystem (6.0.0):
- Capacitor
- CapacitorGeolocation (5.0.2):
- CapacitorGeolocation (6.0.0):
- Capacitor
- CapacitorHaptics (5.0.2):
- CapacitorHaptics (6.0.0):
- Capacitor
- CapacitorKeyboard (5.0.2):
- CapacitorKeyboard (6.0.0):
- Capacitor
- CapacitorLocalNotifications (5.0.2):
- CapacitorLocalNotifications (6.0.0):
- Capacitor
- CapacitorNetwork (5.0.2):
- CapacitorNetwork (6.0.0):
- Capacitor
- CapacitorPreferences (5.0.2):
- CapacitorPreferences (6.0.0):
- Capacitor
- CapacitorPushNotifications (5.0.2):
- CapacitorPushNotifications (6.0.0):
- Capacitor
- CapacitorScreenOrientation (5.0.2):
- CapacitorScreenOrientation (6.0.0):
- Capacitor
- CapacitorScreenReader (5.0.2):
- CapacitorScreenReader (6.0.0):
- Capacitor
- CapacitorShare (5.0.2):
- CapacitorShare (6.0.0):
- Capacitor
- CapacitorSplashScreen (5.0.2):
- CapacitorSplashScreen (6.0.0):
- Capacitor
- CapacitorStatusBar (5.0.2):
- CapacitorStatusBar (6.0.0):
- Capacitor
- CapacitorTextZoom (5.0.2):
- CapacitorTextZoom (6.0.0):
- Capacitor
- CapacitorToast (5.0.2):
- CapacitorToast (6.0.0):
- Capacitor
- Firebase/CoreOnly (9.5.0):
- FirebaseCore (= 9.5.0)
Expand Down Expand Up @@ -201,31 +201,31 @@ EXTERNAL SOURCES:
:path: "../../node_modules/@capacitor/toast"

SPEC CHECKSUMS:
Capacitor: d703b5dde0a7d82df29aa4323845709df29c96a8
CapacitorActionSheet: 5f96ede9bde29ba734a5a31b70cfdaaa7855689f
CapacitorApp: 28fef1fd75b2b3686e875216806fb8416d421097
CapacitorAppLauncher: 222eb443f90379a47bd84c8b3ed8ec47fa7e236f
CapacitorBrowser: 7986ee35377383fc40f7c1a0a793e0d9a49fe527
CapacitorCamera: 15face5f9e030e480929a2c989deaaf3eb0d3947
CapacitorClipboard: a198f34cd0ed4d1777da5edae13445227ec05be3
CapacitorCordova: 9745ab233fe489f3315154b7969deea3ce1b4e85
CapacitorDevice: 980e172f6fbfa0a945c73f908adc74b5a031e7d4
CapacitorDialog: 01c49f7f4b37e7ad59e38fd317a6e5f006f23cdc
CapacitorFilesystem: 3a7bb944feb5b7e9473adeb08662c73141510aa8
CapacitorGeolocation: 8532cd1585dbf0b5b721fa65ea51a36bf9a71e92
CapacitorHaptics: 864585542a435bd41eaabf7f30d9ff5ec03024d3
CapacitorKeyboard: e628d4e66d621c69e449945ebabded17c5b9c2e8
CapacitorLocalNotifications: db01feb38f85b4fd8c0a0d0fa94a4a6410239563
CapacitorNetwork: 77c00ce41b4e014cbc6fdcb233462e7fce4b4755
CapacitorPreferences: 0ad8838944f900284900d9647d9b0145c89ca27d
CapacitorPushNotifications: 0566429afa72fe083a4142a58321f0ad83837096
CapacitorScreenOrientation: d45f5fca4f31a4da15bfe54bd5d4a772e3d726b3
CapacitorScreenReader: c3ac63145683b8e1a52c7217757eedfaec47dc53
CapacitorShare: 931224a0e17615e799d35b26286ab1d05f37d8fb
CapacitorSplashScreen: bd2a056394ba0b8807e7bb3e746424f67c426e03
CapacitorStatusBar: 48f2899f6846cc7d8431b251ebfc58e1c10e3d58
CapacitorTextZoom: 3600e003d8847b4588f500dae23d7962b4639c19
CapacitorToast: d785c9169585b9267b8392094298de7cb0eaa16e
Capacitor: 559d073c4ca6c27f8e7002c807eea94c3ba435a9
CapacitorActionSheet: de123f478f394373f84a96614ce2b1a6c30253e4
CapacitorApp: 9d53aec7101f7b030a950c5bdc4df8612576b279
CapacitorAppLauncher: 24ce4be152a84883378d22114ffe6c492056ced2
CapacitorBrowser: 7e1e2cdbb3e372f09f0bad0c4c21a6d187b679ad
CapacitorCamera: b61f125d92a0ef75d7becb7956fed7dd13187ee0
CapacitorClipboard: 80282f684154124b9019ebf401235b70b0cf4994
CapacitorCordova: 8c4bfdf69368512e85b1d8b724dd7546abeb30af
CapacitorDevice: f8fd88f9edd1261c55a109f32015b09bbbfdc4a0
CapacitorDialog: 64aa82840ee5e9c066f9e1a49c1e186afd3f24d2
CapacitorFilesystem: 60e59ba274c234a979e7a3be2552feaadcee4263
CapacitorGeolocation: 1f12bbe372b65116e851bd8e3a94cf0ef9bacebb
CapacitorHaptics: 9ebc9363f0e9b8eb4295088a0b474530acf1859b
CapacitorKeyboard: deacbd09d8d1029c3681197fb05d206b721d5f73
CapacitorLocalNotifications: 4ab68f0be5f697a579558fadd307d823a9ec1c26
CapacitorNetwork: f15a94c16a33cba7c47a17814cb6bcfe3ea34ded
CapacitorPreferences: c9b839a80baa72e4ed4bdb117618e1950d3046b5
CapacitorPushNotifications: e18636e8a96f1d70b4c669e21c730e995bf5e5c9
CapacitorScreenOrientation: d78ce2b710bfcd1c32d3a090d32b6686c1c95e4f
CapacitorScreenReader: 039da921b443a37ecf4f3f1b39a8a6869a3f58ce
CapacitorShare: a771200d3b924a5d7ad9d9fecbac517e4c0aa74f
CapacitorSplashScreen: 5431ab8d19c1c6e95777d53bfaa7a36a6c3d94c7
CapacitorStatusBar: 2e4369f99166125435641b1908d05f561eaba6f6
CapacitorTextZoom: 696722e5c479b364f2429584f11ad386d609bd1a
CapacitorToast: ba573a7bc5dfd622e78d5be126a84ee221da4180
Firebase: 800f16f07af493d98d017446a315c27af0552f41
FirebaseCore: 25c0400b670fd1e2f2104349cd3b5dcce8d9418f
FirebaseCoreDiagnostics: 17cbf4e72b1dbd64bfdc33d4b1f07bce4f16f1d8
Expand All @@ -239,4 +239,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 86f679db508b8a11da49e0da2c32ba720465ff26

COCOAPODS: 1.12.1
COCOAPODS: 1.15.2
Loading
Loading