Upgrade to Capacitor 5

capacitor-community · Sep 3, 2023 · 5465a7b · 5465a7b
1 parent 3d11ba2
commit 5465a7b
Show file tree

Hide file tree

Showing 14 changed files with 2,222 additions and 1,558 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [5.0.0] - 2023-09-04
+
+### Breaking
+* Minimum Capacitor version is **5.0.0**.! [#211](https://github.com/moberwasserlechner/capacitor-oauth2/issues/211)
+* Remove web option `windowReplace` as it is deprecated and gives build exceptions. See https://www.w3schools.com/jsref/met_win_open.asp for details.
+
 ## [4.0.2] - 2023-04-11
 
 ### Fixed
@@ -139,7 +145,8 @@ This is controlled by Android specific parameters `handleResultOnNewIntent` for
 - Android: Fix Java compiler error #36 (thx @Anthbs)
 - Fix github security error by updating Jest lib
 
-[Unreleased]: https://github.com/moberwasserlechner/capacitor-oauth2/compare/4.0.2...main
+[Unreleased]: https://github.com/moberwasserlechner/capacitor-oauth2/compare/5.0.0...main
+[5.0.0]: https://github.com/moberwasserlechner/capacitor-oauth2/compare/4.0.2...5.0.0
 [4.0.2]: https://github.com/moberwasserlechner/capacitor-oauth2/compare/4.0.1...4.0.2
 [4.0.1]: https://github.com/moberwasserlechner/capacitor-oauth2/compare/4.0.0...4.0.1
 [4.0.0]: https://github.com/moberwasserlechner/capacitor-oauth2/compare/3.0.1...4.0.0

diff --git a/README.md b/README.md
@@ -11,30 +11,32 @@ See [identity providers](#list-of-providers) the community has already used this
 
 ## How to install
 
-For Capacitor v4
+For Capacitor v5
 ```bash
 npm i @byteowls/capacitor-oauth2
 npx cap sync
 ```
-For Capacitor v3 use `3.0.1`
+
+For Capacitor v4
 ```bash
-npm i @byteowls/capacitor-oauth2@3.0.1
+npm i @byteowls/capacitor-oauth2@4
 npx cap sync
 ```
-For Capacitor v2 use `2.1.0`
+For Capacitor v3
 ```bash
-npm i @byteowls/capacitor-oauth2@2.1.0
+npm i @byteowls/capacitor-oauth2@3
 npx cap sync
 ```
 
 ## Versions
 
-| Plugin | For Capacitor         | Docs                                                                                        | Notes                          |
-|--------|-------------------|---------------------------------------------------------------------------------------------|--------------------------------|
-| 4.x    | 4.x.x             | [README](./README.md)                                                                       | Breaking changes see Changelog. XCode 12.0 needs this version  |
-| 3.x    | 3.x.x             | [README](https://github.com/moberwasserlechner/capacitor-oauth2/tree/release/3.x/README.md) | Breaking changes see Changelog. XCode 12.0 needs this version  |
-| 2.x    | 2.x.x             | [README](https://github.com/moberwasserlechner/capacitor-oauth2/tree/release/2.x/README.md) | Breaking changes see Changelog. XCode 11.4 needs this version  |
-| 1.x    | 1.x.x             | [README](https://github.com/moberwasserlechner/capacitor-oauth2/blob/1.1.0/README.md)       |                                |
+| Plugin | For Capacitor | Docs                                                                                  | Notes                                                         |
+|--------|---------------|---------------------------------------------------------------------------------------|---------------------------------------------------------------|
+| 5.x    | 5.x.x         | [README](./README.md)                                                                 | Breaking changes see Changelog. XCode 14.1 needs this version |
+| 4.x    | 4.x.x         | [README](https://github.com/moberwasserlechner/capacitor-oauth2/blob/4.0.0/README.md) | Breaking changes see Changelog. XCode 12.0 needs this version |
+| 3.x    | 3.x.x         | [README](https://github.com/moberwasserlechner/capacitor-oauth2/blob/3.0.1/README.md) | Breaking changes see Changelog. XCode 12.0 needs this version |
+| 2.x    | 2.x.x         | [README](https://github.com/moberwasserlechner/capacitor-oauth2/blob/2.1.0/README.md) | Breaking changes see Changelog. XCode 11.4 needs this version |
+| 1.x    | 1.x.x         | [README](https://github.com/moberwasserlechner/capacitor-oauth2/blob/1.1.0/README.md) |                                                               |
 
 For further details on what has changed see the [CHANGELOG](https://github.com/moberwasserlechner/capacitor-oauth2/blob/main/CHANGELOG.md).
 
@@ -1149,12 +1151,6 @@ See [CHANGELOG](https://github.com/moberwasserlechner/capacitor-oauth2/blob/main
 
 MIT. See [LICENSE](https://github.com/moberwasserlechner/capacitor-oauth2/blob/main/LICENSE).
 
-## BYTEOWLS Software & Consulting
-
-This plugin is powered by [BYTEOWLS Software & Consulting](https://byteowls.com).
-
-If you need extended support for this project like critical changes or releases ahead of schedule. Feel free to contact us for a consulting offer.
-
 ## Disclaimer
 
 We have no business relation to Ionic.
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,12 +1,12 @@
 ext {
     appAuthVersion = project.hasProperty('appAuthVersion') ? rootProject.ext.appAuthVersion : '0.9.1'
-    androidxBrowserVersion = project.hasProperty('androidxBrowserVersion') ? rootProject.ext.androidxBrowserVersion : '1.3.0'
-    junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.1'
+    androidxBrowserVersion = project.hasProperty('androidxBrowserVersion') ? rootProject.ext.androidxBrowserVersion : '1.5.0'
+    junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
     commonsIoVersion = project.hasProperty('commonsIoVersion') ? rootProject.ext.commonsIoVersion : '2.10.0'
-    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.2.0'
+    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.6.1'
     junit5Version = project.hasProperty('junit5Version') ? rootProject.ext.junit5Version : '5.7.2'
     androidJunit5Version = project.hasProperty('androidJunit5Version') ? rootProject.ext.androidJunit5Version : '1.2.2'
-    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.4.0'
+    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1'
 }
 
 buildscript {
@@ -15,17 +15,18 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:8.0.0'
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 30
+    namespace "com.byteowls.capacitor.oauth2"
+    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 33
     defaultConfig {
-        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 21
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 30
+        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 33
         versionCode 1
         versionName "1.0"
         // 1) Make sure to use the AndroidJUnitRunner, or a subclass of it. This requires a dependency on androidx.test:runner, too!
@@ -44,8 +45,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     unitTestVariants.all {

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -1,5 +1,5 @@
 group=com.byteowls.capacitor
 artifactId=capacitor-oauth2
 android.useAndroidX=true
-android.enableJetifier=true
+
 
diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Jul 03 18:50:29 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists