Skip to content

Commit dd18dba

Browse files
authored
fix: minor build changes #8685c6y2h (#22)
1 parent dcb199f commit dd18dba

File tree

7 files changed

+22
-9
lines changed

7 files changed

+22
-9
lines changed

example/android/app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
apply plugin: 'com.android.application'
22

33
android {
4+
namespace "com.example.plugin"
45
compileSdkVersion rootProject.ext.compileSdkVersion
56
defaultConfig {
67
applicationId "com.example.plugin"

example/android/app/capacitor.build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
android {
44
compileOptions {
5-
sourceCompatibility JavaVersion.VERSION_11
6-
targetCompatibility JavaVersion.VERSION_11
5+
sourceCompatibility JavaVersion.VERSION_17
6+
targetCompatibility JavaVersion.VERSION_17
77
}
88
}
99

example/android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ buildscript {
88
maven { url "https://jitpack.io" }
99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:7.2.1'
12-
classpath 'com.google.gms:google-services:4.3.13'
11+
classpath 'com.android.tools.build:gradle:8.1.1'
12+
classpath 'com.google.gms:google-services:4.3.15'
1313

1414
// NOTE: Do not place your application dependencies here; they belong
1515
// in the individual module build.gradle files

example/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ org.gradle.jvmargs=-Xmx1536m
2121
# https://developer.android.com/topic/libraries/support-library/androidx-rn
2222
android.useAndroidX=true
2323
# Automatically convert third-party libraries to use AndroidX
24-
android.enableJetifier=true
24+
#android.enableJetifier=true
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#Thu Aug 31 10:07:56 PDT 2023
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

example/ios/App/Podfile

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
1-
require_relative '../../node_modules/@capacitor/ios/scripts/pods_helpers'
1+
def assertDeploymentTarget(installer)
2+
installer.pods_project.targets.each do |target|
3+
target.build_configurations.each do |config|
4+
# ensure IPHONEOS_DEPLOYMENT_TARGET is at least 13.0
5+
deployment_target = config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f
6+
should_upgrade = deployment_target < 13.0 && deployment_target != 0.0
7+
if should_upgrade
8+
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
9+
end
10+
end
11+
end
12+
end
213

314
platform :ios, '15.0'
415
use_frameworks!

example/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"@capacitor/camera": "latest",
1818
"@capacitor/splash-screen": "latest",
1919
"capacitor-plugin-resgrid": "file:..",
20-
"@capacitor/ios": "^4.0.0",
21-
"@capacitor/android": "^4.0.0"
20+
"@capacitor/ios": "^5.0.0",
21+
"@capacitor/android": "^5.0.0"
2222
},
2323
"devDependencies": {
2424
"@capacitor/cli": "latest",

0 commit comments

Comments
 (0)