Skip to content

Commit

Permalink
build: bump capacitor v5 and android api level v33
Browse files Browse the repository at this point in the history
  • Loading branch information
peterpeterparker committed Aug 20, 2023
1 parent ed8a596 commit 142c4ac
Show file tree
Hide file tree
Showing 12 changed files with 3,823 additions and 16,202 deletions.
5 changes: 3 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
apply plugin: 'com.android.application'

android {
namespace "com.tietracker.app"
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "com.tietracker.app"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 34
versionName "1.13.0"
versionCode 35
versionName "1.14.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
aaptOptions {
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
Expand Down
8 changes: 4 additions & 4 deletions android/app/capacitor.build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@

android {
compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
}

apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
dependencies {
implementation project(':capacitor-splash-screen')
implementation "androidx.webkit:webkit:1.4.0"
implementation "com.android.support:support-v4:26.+"
implementation "androidx.webkit:webkit:1.4.0"
implementation "androidx.legacy:legacy-support-v4:1.0.0"
}
apply from: "../../node_modules/@moodlehq/cordova-plugin-local-notification/src/android/build/localnotification.gradle"
apply from: "../../node_modules/cordova-plugin-badge/src/android/badge.gradle"
apply from: "../../node_modules/cordova-plugin-local-notification/src/android/build/localnotification.gradle"

if (hasProperty('postBuildExtras')) {
postBuildExtras()
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.tietracker.app">
>

<application
android:allowBackup="true"
Expand Down
8 changes: 4 additions & 4 deletions android/app/src/main/res/xml/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
<widget version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<access origin="*" />

<feature name="LocalNotification">
<param name="android-package" value="de.appplant.cordova.plugin.localnotification.LocalNotification"/>
</feature>

<feature name="Badge">
<param name="android-package" value="de.appplant.cordova.plugin.badge.Badge"/>
</feature>
Expand All @@ -15,10 +19,6 @@
<param name="onload" value="true"/>
</feature>

<feature name="LocalNotification">
<param name="android-package" value="de.appplant.cordova.plugin.localnotification.LocalNotification"/>
</feature>

<feature name="SocialSharing">
<param name="android-package" value="nl.xservices.plugins.SocialSharing"/>
</feature>
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:7.2.1'
classpath 'com.google.gms:google-services:4.3.13'
classpath 'com.android.tools.build:gradle:8.0.0'
classpath 'com.google.gms:google-services:4.3.15'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
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-7.4.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
20 changes: 10 additions & 10 deletions android/variables.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
ext {
minSdkVersion = 22
compileSdkVersion = 32
targetSdkVersion = 32
androidxActivityVersion = '1.4.0'
androidxAppCompatVersion = '1.4.2'
compileSdkVersion = 33
targetSdkVersion = 33
androidxActivityVersion = '1.7.0'
androidxAppCompatVersion = '1.6.1'
androidxCoordinatorLayoutVersion = '1.2.0'
androidxCoreVersion = '1.8.0'
androidxFragmentVersion = '1.4.1'
coreSplashScreenVersion = '1.0.0-rc01'
androidxWebkitVersion = '1.4.0'
androidxCoreVersion = '1.10.0'
androidxFragmentVersion = '1.5.6'
coreSplashScreenVersion = '1.0.0'
androidxWebkitVersion = '1.6.1'
junitVersion = '4.13.2'
androidxJunitVersion = '1.1.3'
androidxEspressoCoreVersion = '3.4.0'
androidxJunitVersion = '1.1.5'
androidxEspressoCoreVersion = '3.5.1'
cordovaAndroidVersion = '10.1.1'
}
3 changes: 2 additions & 1 deletion ios/.gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
App/build
App/Pods
App/Podfile.lock
App/App/public
DerivedData
xcuserdata
Expand All @@ -11,3 +10,5 @@ capacitor-cordova-ios-plugins
# Generated Config files
App/App/capacitor.config.json
App/App/config.xml


9 changes: 5 additions & 4 deletions ios/App/App/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
<widget version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<access origin="*" />

<feature name="LocalNotification">
<param name="ios-package" value="APPLocalNotification" onload="true"/>
<param name="onload" value="true"/>
</feature>

<feature name="Badge">
<param name="ios-package" value="APPBadge"/>
</feature>
Expand All @@ -15,10 +20,6 @@
<param name="onload" value="true"/>
</feature>

<feature name="LocalNotification">
<param name="ios-package" value="APPLocalNotification"/>
</feature>

<feature name="SocialSharing">
<param name="ios-package" value="SocialSharing"/>
<param name="onload" value="true"/>
Expand Down
34 changes: 34 additions & 0 deletions ios/App/Podfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
PODS:
- Capacitor (5.2.3):
- CapacitorCordova
- CapacitorCordova (5.2.3)
- CapacitorSplashScreen (5.0.6):
- Capacitor
- CordovaPlugins (5.2.3):
- CapacitorCordova

DEPENDENCIES:
- "Capacitor (from `../../node_modules/@capacitor/ios`)"
- "CapacitorCordova (from `../../node_modules/@capacitor/ios`)"
- "CapacitorSplashScreen (from `../../node_modules/@capacitor/splash-screen`)"
- CordovaPlugins (from `../capacitor-cordova-ios-plugins`)

EXTERNAL SOURCES:
Capacitor:
:path: "../../node_modules/@capacitor/ios"
CapacitorCordova:
:path: "../../node_modules/@capacitor/ios"
CapacitorSplashScreen:
:path: "../../node_modules/@capacitor/splash-screen"
CordovaPlugins:
:path: "../capacitor-cordova-ios-plugins"

SPEC CHECKSUMS:
Capacitor: 6f44cbc33839b8a4202b8eac97041fe584083417
CapacitorCordova: 35def3ebfdef491f0a7b652816eb873ff4b20bbf
CapacitorSplashScreen: 5fa2ab5e46cf5cc530cf16a51c80c7a986579ccd
CordovaPlugins: d644934b604b745e295ed73dee0bc85dcaee89e3

PODFILE CHECKSUM: 5ea994a3ddeb23ed1022878e7d9fcadae4e6a54b

COCOAPODS: 1.11.3
Loading

0 comments on commit 142c4ac

Please sign in to comment.