Skip to content

Commit

Permalink
Merge pull request #291 from gobitfly/cap6
Browse files Browse the repository at this point in the history
Google Play Requirement: Update Dependencies and Build SDK
  • Loading branch information
manuelsc authored Jul 11, 2024
2 parents 1606dbf + 94a374a commit 65519f2
Show file tree
Hide file tree
Showing 14 changed files with 17,795 additions and 29,690 deletions.
6 changes: 3 additions & 3 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion android/app/capacitor.build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}


Expand Down
3 changes: 3 additions & 0 deletions android/app/src/main/assets/capacitor.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,8 @@
},
"android": {
"flavor": "prod"
},
"server": {
"androidScheme": "http"
}
}
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Binary file modified android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Loading

0 comments on commit 65519f2

Please sign in to comment.