Skip to content

Commit 6caa7bb

Browse files
doupdoup
authored
Merge pull request #5 from bugfender/feature/upgrade_capacitor_4
Feature/upgrade capacitor 4
2 parents 5e6d786 + fce210c commit 6caa7bb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+5421
-5019
lines changed

‎android/build.gradle‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ ext {
88
buildscript {
99
repositories {
1010
google()
11-
jcenter()
11+
mavenCentral()
1212
}
1313
dependencies {
14-
classpath 'com.android.tools.build:gradle:4.2.1'
14+
classpath 'com.android.tools.build:gradle:7.2.1'
1515
}
1616
}
1717

@@ -44,7 +44,6 @@ android {
4444
repositories {
4545
google()
4646
mavenCentral()
47-
jcenter()
4847
}
4948

5049

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

Lines changed: 1 addition & 1 deletion
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.0-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎example/android/app/build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ repositories {
3030
}
3131

3232
dependencies {
33+
implementation "androidx.core:core-splashscreen:$coreSplashScreenVersion"
34+
implementation "androidx.coordinatorlayout:coordinatorlayout:$androidxCoordinatorLayoutVersion"
3335
implementation fileTree(include: ['*.jar'], dir: 'libs')
3436
implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
3537
implementation project(':capacitor-android')

‎example/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

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
android:theme="@style/AppTheme">
1212

1313
<activity
14+
android:exported="true"
1415
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
1516
android:name="com.bugfender.sdk.capacitor.example.MainActivity"
1617
android:label="@string/title_activity_main"

‎example/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
</style>
2222
</resources>

‎example/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.1'
11-
classpath 'com.google.gms:google-services:4.3.5'
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+

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#Wed Aug 31 11:54:21 CEST 2022
12
distributionBase=GRADLE_USER_HOME
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
24
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
4-
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6+
zipStoreBase=GRADLE_USER_HOME

‎example/android/variables.gradle‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
ext {
2-
minSdkVersion = 21
3-
compileSdkVersion = 30
4-
targetSdkVersion = 30
5-
androidxActivityVersion = '1.2.0'
6-
androidxAppCompatVersion = '1.2.0'
7-
androidxCoordinatorLayoutVersion = '1.1.0'
8-
androidxCoreVersion = '1.3.2'
9-
androidxFragmentVersion = '1.3.0'
10-
junitVersion = '4.13.1'
11-
androidxJunitVersion = '1.1.2'
12-
androidxEspressoCoreVersion = '3.3.0'
13-
cordovaAndroidVersion = '7.0.0'
2+
minSdkVersion = 22
3+
compileSdkVersion = 32
4+
targetSdkVersion = 32
5+
androidxActivityVersion = '1.4.0'
6+
androidxAppCompatVersion = '1.4.2'
7+
androidxCoordinatorLayoutVersion = '1.2.0'
8+
androidxCoreVersion = '1.8.0'
9+
androidxFragmentVersion = '1.4.1'
10+
junitVersion = '4.13.2'
11+
androidxJunitVersion = '1.1.3'
12+
androidxEspressoCoreVersion = '3.4.0'
13+
cordovaAndroidVersion = '10.1.1'
14+
coreSplashScreenVersion = '1.0.0-rc01'
15+
androidxWebkitVersion = '1.4.0'
1416
}

‎example/ios/.gitignore‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
App/build
2+
App/Pods
3+
App/Podfile.lock
4+
App/App/public
5+
DerivedData
6+
xcuserdata
7+
8+
# Cordova plugins for Capacitor
9+
capacitor-cordova-ios-plugins

0 commit comments

Comments
 (0)