fix: minor build changes #8685c6y2h (#22)

Resgrid · Sep 2, 2023 · dd18dba · dd18dba
1 parent dcb199f
commit dd18dba
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 9 deletions.
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -1,6 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
+    namespace "com.example.plugin"
     compileSdkVersion rootProject.ext.compileSdkVersion
     defaultConfig {
         applicationId "com.example.plugin"

diff --git a/example/android/app/capacitor.build.gradle b/example/android/app/capacitor.build.gradle
@@ -2,8 +2,8 @@
 
 android {
   compileOptions {
-      sourceCompatibility JavaVersion.VERSION_11
-      targetCompatibility JavaVersion.VERSION_11
+      sourceCompatibility JavaVersion.VERSION_17
+      targetCompatibility JavaVersion.VERSION_17
   }
 }
 

diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -8,8 +8,8 @@ buildscript {
         maven { url "https://jitpack.io" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
-        classpath 'com.google.gms:google-services:4.3.13'
+        classpath 'com.android.tools.build:gradle:8.1.1'
+        classpath 'com.google.gms:google-services:4.3.15'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/example/android/gradle.properties b/example/android/gradle.properties
@@ -21,4 +21,4 @@ org.gradle.jvmargs=-Xmx1536m
 # 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.enableJetifier=true
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Thu Aug 31 10:07:56 PDT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/example/ios/App/Podfile b/example/ios/App/Podfile
@@ -1,4 +1,15 @@
-require_relative '../../node_modules/@capacitor/ios/scripts/pods_helpers'
+def assertDeploymentTarget(installer)
+  installer.pods_project.targets.each do |target|
+    target.build_configurations.each do |config|
+      # ensure IPHONEOS_DEPLOYMENT_TARGET is at least 13.0
+      deployment_target = config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f
+      should_upgrade = deployment_target < 13.0 && deployment_target != 0.0
+      if should_upgrade
+        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
+      end
+    end
+  end
+end
 
 platform :ios, '15.0'
 use_frameworks!

diff --git a/example/package.json b/example/package.json
@@ -17,8 +17,8 @@
     "@capacitor/camera": "latest",
     "@capacitor/splash-screen": "latest",
     "capacitor-plugin-resgrid": "file:..",
-    "@capacitor/ios": "^4.0.0",
-    "@capacitor/android": "^4.0.0"
+    "@capacitor/ios": "^5.0.0",
+    "@capacitor/android": "^5.0.0"
   },
   "devDependencies": {
     "@capacitor/cli": "latest",