Merge pull request #245 from gobitfly/dependency-updates

Dependency updates

.eslintignore

@@ -1,3 +1,4 @@
 node_modules
 dist
 .angular
+src/zone-flags.ts

.github/workflows/build.yaml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [16.x]
     steps:
 
       - name: Check out code

.github/workflows/lint-format.yml

@@ -18,7 +18,7 @@ jobs:
     - name: Setup Node Environment
       uses: actions/setup-node@v3
       with:
-        node-version: 14
+        node-version: 16
     - name: Install Dependencies
       run: npm ci
     - name: Check File Format

.gitignore

@@ -34,4 +34,6 @@ npm-debug.log*
 /android/app/src/beta/google-services.json
 /ios/App/GoogleService-Info.plist
 /appassets
-/android/.idea
+/android/.idea
+android/.idea/jarRepositories.xml
+android/.idea/misc.xml

README.md

@@ -49,14 +49,15 @@ NOTE: You need to provide your own google-services.json for Android and GoogleSe
 ### Browser
 To run the app in your browser, simply use
 
-`ionic serve`
+`npm run-script serve`
 
 to start a local webserver with livereload enabled.
 
 ### Android
 
 **Prerequisites**
-* Install [Android Studio](https://developer.android.com/studio#downloads]) (recommended 4.1.1 or newer)
+* NodeJS 16
+* Install [Android Studio](https://developer.android.com/studio#downloads]) (2022.2.1 or newer)
 * Use Android Studio to install the Android SDK: https://capacitorjs.com/docs/android
 
 For Linux Users: Open capacitor.config.json (in the root of the project) and adapt the paths for the _linuxAndroidStudioPath_ variable to reflect your local setup.
@@ -75,7 +76,7 @@ Adapt the --host param to match your computers IP.
 
 #### Build for production
 
-`ionic capacitor run android --prod --release`
+`npm run-script build-android-for-production`
 
 #### Install via Android Studio
 To install the app on a real device, follow this guide: https://developer.android.com/studio/run/device
@@ -85,8 +86,9 @@ Or to run it in an emulator, follow up here: https://developer.android.com/studi
 
 ### iOS
 **Prerequisites**
-* macOS with Catalina or newer
-* Xcode 12.2 or newer
+* NodeJS 16
+* macOS with macOS Monterey 12.5 newer
+* Xcode 14.1 or newer
 
 Build the the app at least once before proceeding:
 
@@ -102,7 +104,7 @@ Adapt the --host param to match your macs IP.
 
 #### Build for production
 
-`ionic capacitor run ios --prod --release`
+`npm run-script build-ios-for-production`
 
 ### Best Practices
 

android/.gitignore

@@ -89,3 +89,4 @@ capacitor-cordova-android-plugins
 
 # Copied web assets
 app/src/main/assets/public
+.idea/

android/app/build.gradle

@@ -8,8 +8,8 @@ android {
         namespace "in.beaconcha.mobile"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 97
-        versionName "4.2.6"
+        versionCode 101
+        versionName "4.3.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -21,15 +21,15 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 
-    flavorDimensions "environment"
+    flavorDimensions += "environment"
     productFlavors {
         prod {
             dimension "environment"
@@ -69,6 +69,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "com.squareup.okhttp3:okhttp:4.9.0"
     implementation 'com.google.code.gson:gson:2.8.9'
+    //implementation 'com.google.firebase:firebase-iid:21.1.0'
     def work_version = "2.7.1"
 
     implementation "androidx.work:work-runtime-ktx:$work_version"

android/app/capacitor.build.gradle

@@ -2,15 +2,14 @@
 
 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(':byteowls-capacitor-oauth2')
-    implementation project(':capacitor-community-http')
     implementation project(':capacitor-app')
     implementation project(':capacitor-browser')
     implementation project(':capacitor-clipboard')
@@ -24,7 +23,7 @@ dependencies {
     implementation project(':capacitor-status-bar')
     implementation project(':capacitor-toast')
     implementation project(':capacitor-navigationbarnx')
-    implementation "com.android.billingclient:billing:4.0.0"
+    implementation "com.android.billingclient:billing:5.2.1"
 }
 
 

android/app/src/main/assets/capacitor.config.json

@@ -8,6 +8,12 @@
 		"SplashScreen": {
 			"launchAutoHide": false,
 			"androidScaleType": "CENTER_CROP"
+		},
+		"CapacitorHttp": {
+			"enabled": true
 		}
+	},
+	"android": {
+		"flavor": "prod"
 	}
 }

android/app/src/main/assets/capacitor.plugins.json

@@ -3,10 +3,6 @@
 		"pkg": "@byteowls/capacitor-oauth2",
 		"classpath": "com.byteowls.capacitor.oauth2.OAuth2ClientPlugin"
 	},
-	{
-		"pkg": "@capacitor-community/http",
-		"classpath": "com.getcapacitor.plugin.http.Http"
-	},
 	{
 		"pkg": "@capacitor/app",
 		"classpath": "com.capacitorjs.plugins.app.AppPlugin"

android/build.gradle

@@ -8,9 +8,9 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.1.2'
         if (!getGradle().getStartParameter().getTaskRequests().toString().contains("Nogoogle")) {
-            classpath 'com.google.gms:google-services:4.3.13'
+            classpath 'com.google.gms:google-services:4.3.15'
         }
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 

android/capacitor.settings.gradle

@@ -5,9 +5,6 @@ project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/
 include ':byteowls-capacitor-oauth2'
 project(':byteowls-capacitor-oauth2').projectDir = new File('../node_modules/@byteowls/capacitor-oauth2/android')
 
-include ':capacitor-community-http'
-project(':capacitor-community-http').projectDir = new File('../node_modules/@capacitor-community/http/android')
-
 include ':capacitor-app'
 project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android')
 

android/gradle.properties

@@ -20,5 +20,6 @@ org.gradle.jvmargs=-Xmx1536m
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+
+
+

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip

android/variables.gradle

@@ -2,15 +2,16 @@ ext {
     minSdkVersion = 22
     compileSdkVersion = 33
     targetSdkVersion = 33
-    androidxActivityVersion = '1.4.0'
-    androidxAppCompatVersion = '1.4.2'
+    androidxActivityVersion = '1.7.0'
+    androidxAppCompatVersion = '1.6.1'
     androidxCoordinatorLayoutVersion = '1.2.0'
-    androidxCoreVersion = '1.8.0'
-    androidxFragmentVersion = '1.4.1'
-    coreSplashScreenVersion = '1.0.1'
-    androidxWebkitVersion = '1.5.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'
+    //firebaseMessagingVersion = '23.2.1'
 }