Skip to content

Commit

Permalink
chore: upgrade to ionic v8 & capacitorjs v6
Browse files Browse the repository at this point in the history
  • Loading branch information
Aashu-Dubey committed Jun 22, 2024
1 parent 519a509 commit ea4d8da
Show file tree
Hide file tree
Showing 20 changed files with 11,927 additions and 22,218 deletions.
2 changes: 2 additions & 0 deletions ionic_ui_templates/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ yarn-error.log
/.angular
/.angular/cache
.sass-cache/
/.nx
/.nx/cache
/connect.lock
/coverage
/libpeerconnection.log
Expand Down
2 changes: 1 addition & 1 deletion ionic_ui_templates/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 "io.ionic.templates"
compileSdkVersion rootProject.ext.compileSdkVersion
compileSdk rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "io.ionic.templates"
minSdkVersion rootProject.ext.minSdkVersion
Expand Down
4 changes: 2 additions & 2 deletions ionic_ui_templates/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 ionic_ui_templates/android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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 ionic_ui_templates/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
14 changes: 7 additions & 7 deletions ionic_ui_templates/android/variables.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
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'
androidxFragmentVersion = '1.5.6'
coreSplashScreenVersion = '1.0.0'
androidxWebkitVersion = '1.6.1'
androidxCoreVersion = '1.12.0'
androidxFragmentVersion = '1.6.2'
coreSplashScreenVersion = '1.0.1'
androidxWebkitVersion = '1.9.0'
junitVersion = '4.13.2'
androidxJunitVersion = '1.1.5'
androidxEspressoCoreVersion = '3.5.1'
Expand Down
10 changes: 5 additions & 5 deletions ionic_ui_templates/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"output": "./svg"
}
],
"styles": ["src/theme/variables.scss", "src/global.scss"],
"styles": ["src/global.scss", "src/theme/variables.scss"],
"scripts": []
},
"configurations": {
Expand Down Expand Up @@ -74,10 +74,10 @@
"builder": "@angular-devkit/build-angular:dev-server",
"configurations": {
"production": {
"browserTarget": "app:build:production"
"buildTarget": "app:build:production"
},
"development": {
"browserTarget": "app:build:development"
"buildTarget": "app:build:development"
},
"ci": {
"progress": false
Expand All @@ -88,7 +88,7 @@
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "app:build"
"buildTarget": "app:build"
}
},
"test": {
Expand All @@ -111,7 +111,7 @@
"output": "./svg"
}
],
"styles": ["src/theme/variables.scss", "src/global.scss"],
"styles": ["src/global.scss", "src/theme/variables.scss"],
"scripts": []
},
"configurations": {
Expand Down
2 changes: 1 addition & 1 deletion ionic_ui_templates/capacitor.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CapacitorConfig } from '@capacitor/cli';
import type { CapacitorConfig } from '@capacitor/cli';

const config: CapacitorConfig = {
appId: 'io.ionic.templates',
Expand Down
2 changes: 2 additions & 0 deletions ionic_ui_templates/ios/App/App.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@
Base,
);
mainGroup = 504EC2FB1FED79650016851F;
packageReferences = (
);
productRefGroup = 504EC3051FED79650016851F /* Products */;
projectDirPath = "";
projectRoot = "";
Expand Down

This file was deleted.

This file was deleted.

9 changes: 8 additions & 1 deletion ionic_ui_templates/ios/App/App/capacitor.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,12 @@
"webDir": "www",
"server": {
"androidScheme": "https"
}
},
"packageClassList": [
"SafeAreaPlugin",
"AppPlugin",
"HapticsPlugin",
"KeyboardPlugin",
"StatusBarPlugin"
]
}
30 changes: 15 additions & 15 deletions ionic_ui_templates/ios/App/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
PODS:
- AashuDubeyCapacitorStatusbarSafeArea (2.1.0):
- AashuDubeyCapacitorStatusbarSafeArea (3.0.0):
- Capacitor
- Capacitor (5.0.3):
- Capacitor (6.1.0):
- CapacitorCordova
- CapacitorApp (5.0.2):
- CapacitorApp (6.0.0):
- Capacitor
- CapacitorCordova (5.0.3)
- CapacitorHaptics (5.0.2):
- CapacitorCordova (6.1.0)
- CapacitorHaptics (6.0.0):
- Capacitor
- CapacitorKeyboard (5.0.2):
- CapacitorKeyboard (6.0.0):
- Capacitor
- CapacitorStatusBar (5.0.2):
- CapacitorStatusBar (6.0.0):
- Capacitor

DEPENDENCIES:
Expand Down Expand Up @@ -39,14 +39,14 @@ EXTERNAL SOURCES:
:path: "../../node_modules/@capacitor/status-bar"

SPEC CHECKSUMS:
AashuDubeyCapacitorStatusbarSafeArea: e6c776b7b5a19904ffd0748b87114c3f1bc7863e
Capacitor: 304a960e431f9e6f78556554ca71c41c1b2b9680
CapacitorApp: ff3f625ee3266e9e3f66a8900985920fa05bbf47
CapacitorCordova: def732a63679698df6fb392bbe6d269a0b61e937
CapacitorHaptics: d5e6ffa733d50c2ffcc79b191bf14547505744d4
CapacitorKeyboard: 18b2e25f50503780d4454ff308d19533d459c2b8
CapacitorStatusBar: 5d6e5b15d447d3d493b0b50ff32b58e551c7840f
AashuDubeyCapacitorStatusbarSafeArea: b32e282503c277e7e6bd2b030feef16658476b5b
Capacitor: 187bd7847b6f71467015a20200a1a071be3e5f14
CapacitorApp: 9d53aec7101f7b030a950c5bdc4df8612576b279
CapacitorCordova: be703980ca797f847c3356f78fa175d21c8330c2
CapacitorHaptics: 9ebc9363f0e9b8eb4295088a0b474530acf1859b
CapacitorKeyboard: deacbd09d8d1029c3681197fb05d206b721d5f73
CapacitorStatusBar: 2e4369f99166125435641b1908d05f561eaba6f6

PODFILE CHECKSUM: cc824c6ffe93d300cbd47f6cab933b50f19661bd

COCOAPODS: 1.12.1
COCOAPODS: 1.15.2
Loading

0 comments on commit ea4d8da

Please sign in to comment.