update capacitor to version 6 and billing library to support android …

…billing 7
gobitfly · Jul 11, 2024 · 94a374a · 94a374a
1 parent df3b67f
commit 94a374a
Show file tree

Hide file tree

Showing 14 changed files with 17,795 additions and 29,690 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    compileSdk rootProject.ext.compileSdkVersion
     defaultConfig {
         applicationId "in.beaconcha.mobile"
         namespace "in.beaconcha.mobile"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 111
-        versionName "4.5.4"
+        versionCode 114
+        versionName "4.5.12"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle
@@ -23,7 +23,7 @@ dependencies {
     implementation project(':capacitor-status-bar')
     implementation project(':capacitor-toast')
     implementation project(':capacitor-navigationbarnx')
-    implementation "com.android.billingclient:billing:5.2.1"
+    implementation "com.android.billingclient:billing:7.0.0"
 }
 
 

diff --git a/android/app/src/main/assets/capacitor.config.json b/android/app/src/main/assets/capacitor.config.json
@@ -15,5 +15,8 @@
 	},
 	"android": {
 		"flavor": "prod"
+	},
+	"server": {
+		"androidScheme": "http"
 	}
 }
diff --git a/android/build.gradle b/android/build.gradle
@@ -8,9 +8,9 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.2'
+        classpath 'com.android.tools.build:gradle:8.2.1'
         if (!getGradle().getStartParameter().getTaskRequests().toString().contains("Nogoogle")) {
-            classpath 'com.google.gms:google-services:4.3.15'
+            classpath 'com.google.gms:google-services:4.4.0'
         }
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 

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 @@
-#Thu Jul 22 09:55:38 CEST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip