Skip to content

Commit 142c4ac

Browse files
peterpeterparkerpeterpeterparker
committedAug 20, 2023
build: bump capacitor v5 and android api level v33
1 parent ed8a596 commit 142c4ac

12 files changed

+3823
-16202
lines changed
 

‎android/app/build.gradle

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
apply plugin: 'com.android.application'
22

33
android {
4+
namespace "com.tietracker.app"
45
compileSdkVersion rootProject.ext.compileSdkVersion
56
defaultConfig {
67
applicationId "com.tietracker.app"
78
minSdkVersion rootProject.ext.minSdkVersion
89
targetSdkVersion rootProject.ext.targetSdkVersion
9-
versionCode 34
10-
versionName "1.13.0"
10+
versionCode 35
11+
versionName "1.14.0"
1112
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1213
aaptOptions {
1314
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

‎android/app/capacitor.build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22

33
android {
44
compileOptions {
5-
sourceCompatibility JavaVersion.VERSION_11
6-
targetCompatibility JavaVersion.VERSION_11
5+
sourceCompatibility JavaVersion.VERSION_17
6+
targetCompatibility JavaVersion.VERSION_17
77
}
88
}
99

1010
apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
1111
dependencies {
1212
implementation project(':capacitor-splash-screen')
13-
implementation "androidx.webkit:webkit:1.4.0"
1413
implementation "com.android.support:support-v4:26.+"
14+
implementation "androidx.webkit:webkit:1.4.0"
1515
implementation "androidx.legacy:legacy-support-v4:1.0.0"
1616
}
17+
apply from: "../../node_modules/@moodlehq/cordova-plugin-local-notification/src/android/build/localnotification.gradle"
1718
apply from: "../../node_modules/cordova-plugin-badge/src/android/badge.gradle"
18-
apply from: "../../node_modules/cordova-plugin-local-notification/src/android/build/localnotification.gradle"
1919

2020
if (hasProperty('postBuildExtras')) {
2121
postBuildExtras()

‎android/app/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.tietracker.app">
3+
>
44

55
<application
66
android:allowBackup="true"

‎android/app/src/main/res/xml/config.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
<widget version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
33
<access origin="*" />
44

5+
<feature name="LocalNotification">
6+
<param name="android-package" value="de.appplant.cordova.plugin.localnotification.LocalNotification"/>
7+
</feature>
8+
59
<feature name="Badge">
610
<param name="android-package" value="de.appplant.cordova.plugin.badge.Badge"/>
711
</feature>
@@ -15,10 +19,6 @@
1519
<param name="onload" value="true"/>
1620
</feature>
1721

18-
<feature name="LocalNotification">
19-
<param name="android-package" value="de.appplant.cordova.plugin.localnotification.LocalNotification"/>
20-
</feature>
21-
2222
<feature name="SocialSharing">
2323
<param name="android-package" value="nl.xservices.plugins.SocialSharing"/>
2424
</feature>

‎android/build.gradle

+2-2
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:7.2.1'
11-
classpath 'com.google.gms:google-services:4.3.13'
10+
classpath 'com.android.tools.build:gradle:8.0.0'
11+
classpath 'com.google.gms:google-services:4.3.15'
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.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎android/variables.gradle

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
ext {
22
minSdkVersion = 22
3-
compileSdkVersion = 32
4-
targetSdkVersion = 32
5-
androidxActivityVersion = '1.4.0'
6-
androidxAppCompatVersion = '1.4.2'
3+
compileSdkVersion = 33
4+
targetSdkVersion = 33
5+
androidxActivityVersion = '1.7.0'
6+
androidxAppCompatVersion = '1.6.1'
77
androidxCoordinatorLayoutVersion = '1.2.0'
8-
androidxCoreVersion = '1.8.0'
9-
androidxFragmentVersion = '1.4.1'
10-
coreSplashScreenVersion = '1.0.0-rc01'
11-
androidxWebkitVersion = '1.4.0'
8+
androidxCoreVersion = '1.10.0'
9+
androidxFragmentVersion = '1.5.6'
10+
coreSplashScreenVersion = '1.0.0'
11+
androidxWebkitVersion = '1.6.1'
1212
junitVersion = '4.13.2'
13-
androidxJunitVersion = '1.1.3'
14-
androidxEspressoCoreVersion = '3.4.0'
13+
androidxJunitVersion = '1.1.5'
14+
androidxEspressoCoreVersion = '3.5.1'
1515
cordovaAndroidVersion = '10.1.1'
1616
}

‎ios/.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
App/build
22
App/Pods
3-
App/Podfile.lock
43
App/App/public
54
DerivedData
65
xcuserdata
@@ -11,3 +10,5 @@ capacitor-cordova-ios-plugins
1110
# Generated Config files
1211
App/App/capacitor.config.json
1312
App/App/config.xml
13+
14+

‎ios/App/App/config.xml

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
<widget version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
33
<access origin="*" />
44

5+
<feature name="LocalNotification">
6+
<param name="ios-package" value="APPLocalNotification" onload="true"/>
7+
<param name="onload" value="true"/>
8+
</feature>
9+
510
<feature name="Badge">
611
<param name="ios-package" value="APPBadge"/>
712
</feature>
@@ -15,10 +20,6 @@
1520
<param name="onload" value="true"/>
1621
</feature>
1722

18-
<feature name="LocalNotification">
19-
<param name="ios-package" value="APPLocalNotification"/>
20-
</feature>
21-
2223
<feature name="SocialSharing">
2324
<param name="ios-package" value="SocialSharing"/>
2425
<param name="onload" value="true"/>

‎ios/App/Podfile.lock

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
PODS:
2+
- Capacitor (5.2.3):
3+
- CapacitorCordova
4+
- CapacitorCordova (5.2.3)
5+
- CapacitorSplashScreen (5.0.6):
6+
- Capacitor
7+
- CordovaPlugins (5.2.3):
8+
- CapacitorCordova
9+
10+
DEPENDENCIES:
11+
- "Capacitor (from `../../node_modules/@capacitor/ios`)"
12+
- "CapacitorCordova (from `../../node_modules/@capacitor/ios`)"
13+
- "CapacitorSplashScreen (from `../../node_modules/@capacitor/splash-screen`)"
14+
- CordovaPlugins (from `../capacitor-cordova-ios-plugins`)
15+
16+
EXTERNAL SOURCES:
17+
Capacitor:
18+
:path: "../../node_modules/@capacitor/ios"
19+
CapacitorCordova:
20+
:path: "../../node_modules/@capacitor/ios"
21+
CapacitorSplashScreen:
22+
:path: "../../node_modules/@capacitor/splash-screen"
23+
CordovaPlugins:
24+
:path: "../capacitor-cordova-ios-plugins"
25+
26+
SPEC CHECKSUMS:
27+
Capacitor: 6f44cbc33839b8a4202b8eac97041fe584083417
28+
CapacitorCordova: 35def3ebfdef491f0a7b652816eb873ff4b20bbf
29+
CapacitorSplashScreen: 5fa2ab5e46cf5cc530cf16a51c80c7a986579ccd
30+
CordovaPlugins: d644934b604b745e295ed73dee0bc85dcaee89e3
31+
32+
PODFILE CHECKSUM: 5ea994a3ddeb23ed1022878e7d9fcadae4e6a54b
33+
34+
COCOAPODS: 1.11.3

0 commit comments

Comments
 (0)