Skip to content

Commit

Permalink
chore: migrate to Capacitor 6
Browse files Browse the repository at this point in the history
  • Loading branch information
jcesarmobile committed Feb 6, 2024
1 parent 202a97d commit 3b95b48
Show file tree
Hide file tree
Showing 11 changed files with 1,884 additions and 1,385 deletions.
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
20 changes: 10 additions & 10 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'
firebaseMessagingVersion = '23.3.1'
playServicesLocationVersion = '21.0.1'
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-rc.0):
- CapacitorCordova
- CapacitorActionSheet (5.0.2):
- CapacitorActionSheet (6.0.0-beta.1):
- Capacitor
- CapacitorApp (5.0.2):
- CapacitorApp (6.0.0-beta.1):
- Capacitor
- CapacitorAppLauncher (5.0.2):
- CapacitorAppLauncher (6.0.0-beta.1):
- Capacitor
- CapacitorBrowser (5.0.2):
- CapacitorBrowser (6.0.0-beta.1):
- Capacitor
- CapacitorCamera (5.0.2):
- CapacitorCamera (6.0.0-beta.1):
- Capacitor
- CapacitorClipboard (5.0.2):
- CapacitorClipboard (6.0.0-beta.1):
- Capacitor
- CapacitorCordova (5.0.2)
- CapacitorDevice (5.0.2):
- CapacitorCordova (6.0.0-rc.0)
- CapacitorDevice (6.0.0-beta.1):
- Capacitor
- CapacitorDialog (5.0.2):
- CapacitorDialog (6.0.0-beta.1):
- Capacitor
- CapacitorFilesystem (5.0.2):
- CapacitorFilesystem (6.0.0-beta.1):
- Capacitor
- CapacitorGeolocation (5.0.2):
- CapacitorGeolocation (6.0.0-beta.1):
- Capacitor
- CapacitorHaptics (5.0.2):
- CapacitorHaptics (6.0.0-beta.1):
- Capacitor
- CapacitorKeyboard (5.0.2):
- CapacitorKeyboard (6.0.0-beta.1):
- Capacitor
- CapacitorLocalNotifications (5.0.2):
- CapacitorLocalNotifications (6.0.0-beta.1):
- Capacitor
- CapacitorNetwork (5.0.2):
- CapacitorNetwork (6.0.0-beta.1):
- Capacitor
- CapacitorPreferences (5.0.2):
- CapacitorPreferences (6.0.0-beta.1):
- Capacitor
- CapacitorPushNotifications (5.0.2):
- CapacitorPushNotifications (6.0.0-beta.1):
- Capacitor
- CapacitorScreenOrientation (5.0.2):
- CapacitorScreenOrientation (6.0.0-beta.1):
- Capacitor
- CapacitorScreenReader (5.0.2):
- CapacitorScreenReader (6.0.0-beta.1):
- Capacitor
- CapacitorShare (5.0.2):
- CapacitorShare (6.0.0-beta.1):
- Capacitor
- CapacitorSplashScreen (5.0.2):
- CapacitorSplashScreen (6.0.0-beta.1):
- Capacitor
- CapacitorStatusBar (5.0.2):
- CapacitorStatusBar (6.0.0-beta.1):
- Capacitor
- CapacitorTextZoom (5.0.2):
- CapacitorTextZoom (6.0.0-beta.1):
- Capacitor
- CapacitorToast (5.0.2):
- CapacitorToast (6.0.0-beta.1):
- 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: c5b8b4e73032b078db259f1bbe71afd09fd84250
CapacitorActionSheet: 59e74e556759df83bf6f4578253151f2e5635c51
CapacitorApp: 96672537adb2c4b0890024f1cd8e2a3b510adc03
CapacitorAppLauncher: 302e03767df8bbf22111065b1a162128f983dacb
CapacitorBrowser: 78e8783fb44753db1424940d478df26c64126434
CapacitorCamera: 7abd3a373c133051f5481988f2dc6311f2fb0dad
CapacitorClipboard: 30d1b904eee02c5c7d8faeb729f2a6842df94078
CapacitorCordova: e8930c71b1bf90e793253f3057b3354a88ed83b3
CapacitorDevice: 74dfd29758d0291a6d560f3849b7de3ea0a97beb
CapacitorDialog: 5bdd898c172ce841b29e91c1e112608226224d82
CapacitorFilesystem: 47f90eb844f08192946315f3a0b4c12c3af4d4c2
CapacitorGeolocation: 968f007ed07d019dee7fe93a44a142683ce4880e
CapacitorHaptics: a41a9c0c1deadb79550885a0a0786bec2c5f3b24
CapacitorKeyboard: 5b92ccdd5177aa0fc1b25d6ae885c96594b4cc98
CapacitorLocalNotifications: 1ba0bb7c767ec02f5386c10574074af9fcac3154
CapacitorNetwork: d140cfa52c5eb4acb513a14f9f921c36031d6283
CapacitorPreferences: 9dde27d80d96402baf2a4a2f457f7fe3b0ac280c
CapacitorPushNotifications: ea0d1948195577a30ec8d2a06df1c56db41eda49
CapacitorScreenOrientation: cfc6b91632147ddef7038e96a7a244a7c2301fab
CapacitorScreenReader: b37452f0f29de3c7b154a61960a686367b69f76c
CapacitorShare: ffe39c893a9298a170529cbb1b59293685e3aff7
CapacitorSplashScreen: b9552bf341655cd0a9a3975dd9503aa43ac785ac
CapacitorStatusBar: 84f75b4b7814bdbaea7464a44b22511c2dba12ef
CapacitorTextZoom: f53cedad75b2e3ac397f820740433a0f043a0b7f
CapacitorToast: 56d4b16332889badadba4202a30b9cb1fdb00cb6
Firebase: 800f16f07af493d98d017446a315c27af0552f41
FirebaseCore: 25c0400b670fd1e2f2104349cd3b5dcce8d9418f
FirebaseCoreDiagnostics: 17cbf4e72b1dbd64bfdc33d4b1f07bce4f16f1d8
Expand All @@ -239,4 +239,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 86f679db508b8a11da49e0da2c32ba720465ff26

COCOAPODS: 1.12.1
COCOAPODS: 1.14.3
Loading

0 comments on commit 3b95b48

Please sign in to comment.