Skip to content

Commit

Permalink
chore(deps): update to Capacitor 6 (#50)
Browse files Browse the repository at this point in the history
  • Loading branch information
robingenz authored Jul 29, 2024
1 parent 44a1744 commit 57a5de8
Show file tree
Hide file tree
Showing 12 changed files with 3,654 additions and 20,071 deletions.
10 changes: 0 additions & 10 deletions android/.idea/runConfigurations.xml

This file was deleted.

2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ keystoreProperties.load(new FileInputStream(keystorePropertiesFile))

android {
namespace "de.dhbw.vs.standortapp"
compileSdkVersion rootProject.ext.compileSdkVersion
compileSdk rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "de.dhbw.vs.standortapp"
minSdkVersion rootProject.ext.minSdkVersion
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/assets/capacitor.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"webDir": "www",
"npmClient": "npm",
"server": {
"androidScheme": "http",
"iosScheme": "ionic"
},
"cordova": {
Expand Down
6 changes: 3 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {

repositories {
google()
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.
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
30 changes: 15 additions & 15 deletions android/variables.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
ext {
minSdkVersion = 22
compileSdkVersion = 33
targetSdkVersion = 33
androidxActivityVersion = '1.7.0'
androidxAppCompatVersion = '1.6.1'
androidxCoordinatorLayoutVersion = '1.2.0'
androidxCoreVersion = '1.10.0'
androidxFragmentVersion = '1.5.6'
junitVersion = '4.13.2'
androidxJunitVersion = '1.1.5'
androidxEspressoCoreVersion = '3.5.1'
cordovaAndroidVersion = '10.1.1'
coreSplashScreenVersion = '1.0.0'
androidxWebkitVersion = '1.6.1'
}
minSdkVersion = 22
compileSdkVersion = 34
targetSdkVersion = 34
androidxActivityVersion = '1.8.0'
androidxAppCompatVersion = '1.6.1'
androidxCoordinatorLayoutVersion = '1.2.0'
androidxCoreVersion = '1.12.0'
androidxFragmentVersion = '1.6.2'
junitVersion = '4.13.2'
androidxJunitVersion = '1.1.5'
androidxEspressoCoreVersion = '3.5.1'
cordovaAndroidVersion = '10.1.1'
coreSplashScreenVersion = '1.0.1'
androidxWebkitVersion = '1.9.0'
}
1 change: 1 addition & 0 deletions capacitor.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"webDir": "www",
"npmClient": "npm",
"server": {
"androidScheme": "http",
"iosScheme": "ionic"
},
"cordova": {
Expand Down
15 changes: 14 additions & 1 deletion ios/App/App/capacitor.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,18 @@
"launchAutoHide": false,
"androidScaleType": "CENTER_CROP"
}
}
},
"packageClassList": [
"ActionSheetPlugin",
"AppPlugin",
"ClipboardPlugin",
"KeyboardPlugin",
"PreferencesPlugin",
"SharePlugin",
"SplashScreenPlugin",
"StatusBarPlugin",
"FileOpenerPlugin",
"NfcPlugin",
"CDVPlugin"
]
}
52 changes: 26 additions & 26 deletions ios/App/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
PODS:
- Capacitor (5.6.0):
- Capacitor (6.1.1):
- CapacitorCordova
- CapacitorActionSheet (5.0.7):
- CapacitorActionSheet (6.0.1):
- Capacitor
- CapacitorApp (5.0.7):
- CapacitorApp (6.0.0):
- Capacitor
- CapacitorClipboard (5.0.7):
- CapacitorClipboard (6.0.0):
- Capacitor
- CapacitorCordova (5.6.0)
- CapacitorKeyboard (5.0.8):
- CapacitorCordova (6.1.1)
- CapacitorKeyboard (6.0.1):
- Capacitor
- CapacitorPreferences (5.0.7):
- CapacitorPreferences (6.0.1):
- Capacitor
- CapacitorShare (5.0.7):
- CapacitorShare (6.0.1):
- Capacitor
- CapacitorSplashScreen (5.0.7):
- CapacitorSplashScreen (6.0.1):
- Capacitor
- CapacitorStatusBar (5.0.7):
- CapacitorStatusBar (6.0.0):
- Capacitor
- CapawesomeTeamCapacitorFileOpener (5.0.4):
- CapawesomeTeamCapacitorFileOpener (6.1.0):
- Capacitor
- CapawesomeTeamCapacitorNfc (5.1.0-dev.7d38c01.1709239536):
- CapawesomeTeamCapacitorNfc (6.2.0):
- Capacitor
- CordovaPlugins (5.6.0):
- CordovaPlugins (6.1.1):
- CapacitorCordova

DEPENDENCIES:
Expand Down Expand Up @@ -69,19 +69,19 @@ EXTERNAL SOURCES:
:path: "../capacitor-cordova-ios-plugins"

SPEC CHECKSUMS:
Capacitor: ebfc16cdb8116d04c101686b080342872da42d43
CapacitorActionSheet: 8096e5cb8a3dfa89b03a40a62ea4836111263cb4
CapacitorApp: 17fecd0e6cb23feafac7eb0939417389038b0979
CapacitorClipboard: 45e5e25f2271f98712985d422776cdc5a779cca1
CapacitorCordova: 931b48fcdbc9bc985fc2f16cec9f77c794a27729
CapacitorKeyboard: aec619a578235c6ce279075009a2689c2cf5c42c
CapacitorPreferences: 77ac427e98db83bace772455f8ba447430382c4c
CapacitorShare: c6a1ebbf0114ff9e863b966cd6052678fa25d480
CapacitorSplashScreen: dd3de3f3644710fa2a697cfb91ec262eece4d242
CapacitorStatusBar: f390fbb49b82ffb754ea4b3cf71dc8b048baf3e7
CapawesomeTeamCapacitorFileOpener: a635d36c142c95018855c21c102da07eb88a4e1e
CapawesomeTeamCapacitorNfc: 62f7b56f556612e050d95a1be2d459c55b02eaa3
CordovaPlugins: 51a49218c1b6e2ae7d7f40efa9159eb978ddc888
Capacitor: 8941aba4364ba9d1b22188569001f2ce45cc2b00
CapacitorActionSheet: bff87d8384fd38918531ee839a2ec3c2be115f6a
CapacitorApp: 9d53aec7101f7b030a950c5bdc4df8612576b279
CapacitorClipboard: 80282f684154124b9019ebf401235b70b0cf4994
CapacitorCordova: 8f2cc8d8d3619c566e9418fe8772064a94266106
CapacitorKeyboard: 5f32a712adf41e07a61caafb82cf29fb6d8ba123
CapacitorPreferences: 72909b165bc7807103778ddbb86d5d8ce06abf71
CapacitorShare: 02222f2457ff003e642370a9c1ecd101baaa27c8
CapacitorSplashScreen: 61645214e8f955ff2b80f16a6a3648960fe4c89f
CapacitorStatusBar: 2e4369f99166125435641b1908d05f561eaba6f6
CapawesomeTeamCapacitorFileOpener: 3b92b7d407c6a85e241e77ff081f0dcc4beb86b3
CapawesomeTeamCapacitorNfc: d1c1af83a57d1f385c221a50c894244e116c3160
CordovaPlugins: e46692a88b8b37ca8bd53ae20ee33bbcb18248cd

PODFILE CHECKSUM: baa07d86309c338c813d17409138037a1834285f

Expand Down
Loading

0 comments on commit 57a5de8

Please sign in to comment.