Skip to content

Commit

Permalink
Merge pull request #3249 from numbersprotocol/feature-update-android-…
Browse files Browse the repository at this point in the history
…target

feat(android): target Android API level 34
  • Loading branch information
olgahaha authored Jul 24, 2024
2 parents 4d54265 + cd4c3c5 commit ca38c19
Show file tree
Hide file tree
Showing 12 changed files with 392 additions and 197 deletions.
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.application'

android {
namespace "io.numbersprotocol.capturelite"
compileSdkVersion rootProject.ext.compileSdkVersion
compileSdk rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "io.numbersprotocol.capturelite"
minSdkVersion rootProject.ext.minSdkVersion
Expand Down
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.0.2'
classpath 'com.google.gms:google-services:4.3.15'
classpath 'com.android.tools.build:gradle:8.5.1'
classpath 'com.google.gms:google-services:4.4.0'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sun Jun 25 16:40:42 CST 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
14 changes: 7 additions & 7 deletions android/variables.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
ext {
minSdkVersion = 28
compileSdkVersion = 34
targetSdkVersion = 33
androidxActivityVersion = '1.7.0'
compileSdkVersion = 35
targetSdkVersion = 34
androidxActivityVersion = '1.8.0'
androidxAppCompatVersion = '1.6.1'
androidxCoordinatorLayoutVersion = '1.2.0'
androidxCoreVersion = '1.10.0'
androidxFragmentVersion = '1.5.6'
coreSplashScreenVersion = '1.0.0'
androidxWebkitVersion = '1.6.1'
androidxCoreVersion = '1.12.0'
androidxFragmentVersion = '1.6.2'
coreSplashScreenVersion = '1.0.1'
androidxWebkitVersion = '1.9.0'
junitVersion = '4.13.2'
androidxJunitVersion = '1.1.5'
androidxEspressoCoreVersion = '3.5.1'
Expand Down
2 changes: 0 additions & 2 deletions ios/App/App/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@
<string>Uses Bluetooth to connect and interact with GoPro Camera</string>
<key>NSCameraUsageDescription</key>
<string>Grant camera permission to allow the app to take images and videos of the unique moments that you want to keep.</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>Always grant GPS permission to allow the app to append location information to your photo automatically so that you or anyone who you share the photo with will know where the photo is taken.</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Grant GPS permission when the app is in use to allow the app to append location information to your photo automatically so that you or anyone who you share the photo with will know where the photo is taken.</string>
<key>NSMicrophoneUsageDescription</key>
Expand Down
Loading

0 comments on commit ca38c19

Please sign in to comment.