Skip to content

Commit 7d5b83d

Browse files
bafubafu
authored
Merge pull request #2329 from numbersprotocol/feat-upgrade-capacitor-from-3-to-4-try-1
Feat upgrade capacitor from 3 to 4 try 1
2 parents 77e5302 + 9c6b1a3 commit 7d5b83d

File tree

20 files changed

+457
-494
lines changed

20 files changed

+457
-494
lines changed

‎android/.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎android/.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎android/app/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ repositories {
2828
}
2929

3030
dependencies {
31+
implementation "androidx.core:core-splashscreen:$coreSplashScreenVersion"
32+
implementation "androidx.coordinatorlayout:coordinatorlayout:$androidxCoordinatorLayoutVersion"
3133
implementation fileTree(include: ['*.jar'], dir: 'libs')
3234
implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
3335
implementation project(':capacitor-android')

‎android/app/capacitor.build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

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

‎android/app/src/main/res/values/styles.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
<item name="colorAccent">@color/colorAccent</item>
1010
</style>
1111

12-
<style name="AppTheme.NoActionBar" parent="Theme.AppCompat.NoActionBar">
12+
<style name="AppTheme.NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
1313
<item name="windowActionBar">false</item>
1414
<item name="windowNoTitle">true</item>
1515
<item name="android:background">@null</item>
1616
</style>
1717

1818

19-
<style name="AppTheme.NoActionBarLaunch" parent="AppTheme.NoActionBar">
19+
<style name="AppTheme.NoActionBarLaunch" parent="Theme.SplashScreen">
2020
<item name="android:background">@drawable/splash</item>
2121
<item name="android:windowNoTitle">true</item>
2222
<item name="android:windowActionBar">false</item>

‎android/build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ buildscript {
44

55
repositories {
66
google()
7-
jcenter()
7+
mavenCentral()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:4.2.0'
11-
classpath 'com.google.gms:google-services:4.3.3'
10+
classpath 'com.android.tools.build:gradle:7.2.1'
11+
classpath 'com.google.gms:google-services:4.3.13'
1212

1313
// NOTE: Do not place your application dependencies here; they belong
1414
// in the individual module build.gradle files
@@ -20,10 +20,11 @@ apply from: "variables.gradle"
2020
allprojects {
2121
repositories {
2222
google()
23-
jcenter()
23+
mavenCentral()
2424
}
2525
}
2626

2727
task clean(type: Delete) {
2828
delete rootProject.buildDir
2929
}
30+

‎android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip

‎android/variables.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ext {
33
compileSdkVersion = 32
44
targetSdkVersion = 32
55
androidxActivityVersion = '1.4.0'
6-
androidxAppCompatVersion = '1.4.0'
6+
androidxAppCompatVersion = '1.4.2'
77
androidxCoordinatorLayoutVersion = '1.2.0'
88
androidxCoreVersion = '1.8.0'
99
androidxFragmentVersion = '1.4.1'
@@ -12,5 +12,5 @@ ext {
1212
junitVersion = '4.13.2'
1313
androidxJunitVersion = '1.1.3'
1414
androidxEspressoCoreVersion = '3.4.0'
15-
cordovaAndroidVersion = '10.1.1'
15+
cordovaAndroidVersion = '10.1.1'
1616
}

‎ios/App/App.xcodeproj/project.pbxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@
295295
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
296296
GCC_WARN_UNUSED_FUNCTION = YES;
297297
GCC_WARN_UNUSED_VARIABLE = YES;
298-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
298+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
299299
MTL_ENABLE_DEBUG_INFO = YES;
300300
ONLY_ACTIVE_ARCH = YES;
301301
SDKROOT = iphoneos;
@@ -348,7 +348,7 @@
348348
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
349349
GCC_WARN_UNUSED_FUNCTION = YES;
350350
GCC_WARN_UNUSED_VARIABLE = YES;
351-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
351+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
352352
MTL_ENABLE_DEBUG_INFO = NO;
353353
SDKROOT = iphoneos;
354354
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -368,15 +368,15 @@
368368
DEVELOPMENT_TEAM = G7NB5YCKAP;
369369
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = G7NB5YCKAP;
370370
INFOPLIST_FILE = App/Info.plist;
371-
IPHONEOS_DEPLOYMENT_TARGET = 14.7;
371+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
372372
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
373373
MARKETING_VERSION = 0.69.2;
374374
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
375375
PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite;
376376
PRODUCT_NAME = "$(TARGET_NAME)";
377377
PROVISIONING_PROFILE_SPECIFIER = NumbersAppDistributionV4;
378378
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = NumbersAppDistributionV4;
379-
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG USE_PUSH";
379+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG";
380380
SWIFT_VERSION = 5.0;
381381
TARGETED_DEVICE_FAMILY = "1,2";
382382
VERSIONING_SYSTEM = "apple-generic";
@@ -395,14 +395,14 @@
395395
DEVELOPMENT_TEAM = G7NB5YCKAP;
396396
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = G7NB5YCKAP;
397397
INFOPLIST_FILE = App/Info.plist;
398-
IPHONEOS_DEPLOYMENT_TARGET = 14.7;
398+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
399399
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
400400
MARKETING_VERSION = 0.69.2;
401401
PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite;
402402
PRODUCT_NAME = "$(TARGET_NAME)";
403403
PROVISIONING_PROFILE_SPECIFIER = NumbersAppDistributionV4;
404404
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = NumbersAppDistributionV4;
405-
SWIFT_ACTIVE_COMPILATION_CONDITIONS = USE_PUSH;
405+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
406406
SWIFT_VERSION = 5.0;
407407
TARGETED_DEVICE_FAMILY = "1,2";
408408
VERSIONING_SYSTEM = "apple-generic";

‎ios/App/App/AppDelegate.swift

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
5050
return ApplicationDelegateProxy.shared.application(application, continue: userActivity, restorationHandler: restorationHandler)
5151
}
5252

53-
override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
54-
super.touchesBegan(touches, with: event)
55-
56-
let statusBarRect = UIApplication.shared.statusBarFrame
57-
guard let touchPoint = event?.allTouches?.first?.location(in: self.window) else { return }
58-
59-
if statusBarRect.contains(touchPoint) {
60-
NotificationCenter.default.post(name: .capacitorStatusBarTapped, object: nil)
61-
}
62-
}
6353

6454

6555
func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
@@ -80,3 +70,4 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
8070

8171
}
8272

73+

0 commit comments

Comments
 (0)