Merge pull request #52 from capacitor-community/capv6-support

capacitor 6 support

.github/workflows/main.yml

@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
 
 env:
-  NODE_VERSION: 16
+  NODE_VERSION: 20
   JAVA_VERSION: 17
 
 jobs:
@@ -31,13 +31,13 @@ jobs:
     # needs: lint
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
       - name: Set up Java ${{ env.JAVA_VERSION }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: ${{ env.JAVA_VERSION }}
@@ -46,13 +46,13 @@ jobs:
 
   verify-ios:
     name: Verify iOS
-    runs-on: macos-latest
+    runs-on: macos-14
     # needs: lint
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
       - run: npm ci

CONTRIBUTING.md

@@ -1,3 +1,3 @@
 # Contributing
 
-TODO
+https://capacitorjs.com/docs/getting-started/environment-setup

README.md

@@ -6,7 +6,7 @@
 </p>
 
 <p align="center">
-  <img src="https://img.shields.io/maintenance/yes/2023?style=flat-square" />
+  <img src="https://img.shields.io/maintenance/yes/2024?style=flat-square" />
   <a href="https://www.npmjs.com/package/@capacitor-community/app-icon"><img src="https://img.shields.io/npm/l/@capacitor-community/app-icon?style=flat-square" /></a>
 <br>
   <a href="https://www.npmjs.com/package/@capacitor-community/app-icon"><img src="https://img.shields.io/npm/dw/@capacitor-community/app-icon?style=flat-square" /></a>

android/build.gradle

@@ -11,18 +11,18 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.0'
+        classpath 'com.android.tools.build:gradle:8.2.1'
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
     namespace "com.mycompany.plugins.example"
-    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 33
+    compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 34
     defaultConfig {
         minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 33
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 34
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

android/gradle.properties

@@ -20,6 +20,4 @@ org.gradle.jvmargs=-Xmx1536m
 # Android operating system, and which are packaged with your app's APK
 # 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/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 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.2.1-all.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

example/android/app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     namespace "com.example.app"
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    compileSdk rootProject.ext.compileSdkVersion
     defaultConfig {
         applicationId "com.example.app"
         minSdkVersion rootProject.ext.minSdkVersion

example/android/build.gradle

@@ -7,8 +7,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.0'
-        classpath 'com.google.gms:google-services:4.3.15'
+        classpath 'com.android.tools.build:gradle:8.2.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

example/android/capacitor.settings.gradle

@@ -3,7 +3,7 @@ include ':capacitor-android'
 project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
 
 include ':capacitor-community-app-icon'
-project(':capacitor-community-app-icon').projectDir = new File('../node_modules/@capacitor-community/app-icon/android')
+project(':capacitor-community-app-icon').projectDir = new File('../../android')
 
 include ':capacitor-app'
 project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android')

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 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.2.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

example/android/variables.gradle

@@ -1,14 +1,14 @@
 ext {
     minSdkVersion = 22
-    compileSdkVersion = 33
-    targetSdkVersion = 33
-    androidxActivityVersion = '1.7.0'
+    compileSdkVersion = 34
+    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'

example/ios/App/App.xcodeproj/project.pbxproj

@@ -13,9 +13,6 @@
 		504EC30D1FED79650016851F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30B1FED79650016851F /* Main.storyboard */; };
 		504EC30F1FED79650016851F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30E1FED79650016851F /* Assets.xcassets */; };
 		504EC3121FED79650016851F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC3101FED79650016851F /* LaunchScreen.storyboard */; };
-		6C75BC5D260956A4001D6D8C /* stencil-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C75BC5C260956A4001D6D8C /* stencil-icon.png */; };
-		6C75BC60260956AB001D6D8C /* ionitron-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C75BC5F260956AB001D6D8C /* ionitron-icon.png */; };
-		6C75BC6426095757001D6D8C /* ionic-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 6C75BC6326095757001D6D8C /* ionic-icon.png */; };
 		6CA96339260938650052EF08 /* public in Resources */ = {isa = PBXBuildFile; fileRef = 6CA96338260938650052EF08 /* public */; };
 		E0919CDF06B2B78F5AC5638D /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8494654FAA1E2CBFD35BBD68 /* Pods_App.framework */; };
 /* End PBXBuildFile section */
@@ -29,9 +26,6 @@
 		504EC30E1FED79650016851F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		504EC3111FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		504EC3131FED79650016851F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		6C75BC5C260956A4001D6D8C /* stencil-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "stencil-icon.png"; path = "../../../../src/assets/icon/stencil-icon.png"; sourceTree = "<group>"; };
-		6C75BC5F260956AB001D6D8C /* ionitron-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ionitron-icon.png"; path = "../../../../src/assets/icon/ionitron-icon.png"; sourceTree = "<group>"; };
-		6C75BC6326095757001D6D8C /* ionic-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ionic-icon.png"; path = "../../../../src/assets/icon/ionic-icon.png"; sourceTree = "<group>"; };
 		6CA96338260938650052EF08 /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = "<group>"; };
 		8494654FAA1E2CBFD35BBD68 /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B43B80CC6554ED2F938B29AE /* Pods-App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.debug.xcconfig"; path = "Target Support Files/Pods-App/Pods-App.debug.xcconfig"; sourceTree = "<group>"; };
@@ -79,7 +73,6 @@
 		504EC3061FED79650016851F /* App */ = {
 			isa = PBXGroup;
 			children = (
-				6C75BC5826095672001D6D8C /* AlternateIcons */,
 				6CA96338260938650052EF08 /* public */,
 				50379B222058CBB4000EE86E /* capacitor.config.json */,
 				504EC3071FED79650016851F /* AppDelegate.swift */,
@@ -92,23 +85,12 @@
 			path = App;
 			sourceTree = "<group>";
 		};
-		6C75BC5826095672001D6D8C /* AlternateIcons */ = {
-			isa = PBXGroup;
-			children = (
-				6C75BC5C260956A4001D6D8C /* stencil-icon.png */,
-				6C75BC6326095757001D6D8C /* ionic-icon.png */,
-				6C75BC5F260956AB001D6D8C /* ionitron-icon.png */,
-			);
-			path = AlternateIcons;
-			sourceTree = "<group>";
-		};
 		BD0A62101659FC9DE8009DE3 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
 				B43B80CC6554ED2F938B29AE /* Pods-App.debug.xcconfig */,
 				EB22F58BE931B312E0E183B8 /* Pods-App.release.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -176,11 +158,8 @@
 				504EC3121FED79650016851F /* LaunchScreen.storyboard in Resources */,
 				504EC30F1FED79650016851F /* Assets.xcassets in Resources */,
 				50379B232058CBB4000EE86E /* capacitor.config.json in Resources */,
-				6C75BC6426095757001D6D8C /* ionic-icon.png in Resources */,
-				6C75BC5D260956A4001D6D8C /* stencil-icon.png in Resources */,
 				504EC30D1FED79650016851F /* Main.storyboard in Resources */,
 				6CA96339260938650052EF08 /* public in Resources */,
-				6C75BC60260956AB001D6D8C /* ionitron-icon.png in Resources */,
 				2FAD9763203C412B000D30F8 /* config.xml in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -369,7 +348,9 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = B43B80CC6554ED2F938B29AE /* Pods-App.debug.xcconfig */;
 			buildSettings = {
+				ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "ionitron ionic stencil";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_STYLE = Automatic;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@@ -387,7 +368,9 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = EB22F58BE931B312E0E183B8 /* Pods-App.release.xcconfig */;
 			buildSettings = {
+				ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "ionitron ionic stencil";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_STYLE = Automatic;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;

example/ios/App/App/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,14 +1,14 @@
 {
-    "images" : [
-      {
-        "filename" : "[email protected]",
-        "idiom" : "universal",
-        "platform" : "ios",
-        "size" : "1024x1024"
-      }
-    ],
-    "info" : {
-      "author" : "xcode",
-      "version" : 1
+  "images" : [
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
     }
-}
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

example/ios/App/App/Assets.xcassets/Contents.json

@@ -1,6 +1,6 @@
 {
-  "info": {
-    "version": 1,
-    "author": "xcode"
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
   }
 }

example/ios/App/App/Assets.xcassets/ionic.appiconset/Contents.json

@@ -0,0 +1,14 @@
+{
+  "images" : [
+    {
+      "filename" : "ionic.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

example/ios/App/App/Assets.xcassets/ionitron.appiconset/Contents.json

@@ -0,0 +1,14 @@
+{
+  "images" : [
+    {
+      "filename" : "ionitron.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

example/ios/App/App/Assets.xcassets/stencil.appiconset/Contents.json

@@ -0,0 +1,14 @@
+{
+  "images" : [
+    {
+      "filename" : "stencil.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

example/ios/App/App/Info.plist

@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
-        <string>example</string>
+	<string>example</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -40,8 +40,6 @@
 	</dict>
 	<key>NSCameraUsageDescription</key>
 	<string>To Take Photos and Video</string>
-	<key>NSLocationAlwaysUsageDescription</key>
-	<string>Always allow Geolocation?</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>Allow Geolocation?</string>
 	<key>NSMicrophoneUsageDescription</key>
@@ -73,42 +71,5 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<true/>
-    <key>CFBundleIcons</key>
-    <dict>
-        <key>CFBundleAlternateIcons</key>
-        <dict>
-            <!-- The name you use in code -->
-            <key>ionic-icon</key>
-            <dict>
-                <key>UIPrerenderedIcon</key>
-                <true/>
-                <key>CFBundleIconFiles</key>
-                <array>
-                    <!-- The actual filenames. Don't list the @2x/@3x files here, and you can use just the biggest one if you like -->
-                    <string>ionic-icon</string>
-                </array>
-            </dict>
-            <key>ionitron-icon</key>
-            <dict>
-                <key>UIPrerenderedIcon</key>
-                <true/>
-                <key>CFBundleIconFiles</key>
-                <array>
-                    <!-- The actual filenames. Don't list the @2x/@3x files here, and you can use just the biggest one if you like -->
-                    <string>ionitron-icon</string>
-                </array>
-            </dict>
-            <key>stencil-icon</key>
-            <dict>
-                <key>UIPrerenderedIcon</key>
-                <true/>
-                <key>CFBundleIconFiles</key>
-                <array>
-                    <!-- The actual filenames. Don't list the @2x/@3x files here, and you can use just the biggest one if you like -->
-                    <string>stencil-icon</string>
-                </array>
-            </dict>
-        </dict>
-    </dict>
 </dict>
 </plist>

example/ios/App/App/capacitor.config.json

@@ -9,5 +9,13 @@
 			"launchShowDuration": 0
 		}
 	},
-	"cordova": {}
+	"cordova": {},
+	"packageClassList": [
+		"AppIcon",
+		"AppIcon",
+		"AppPlugin",
+		"DevicePlugin",
+		"HapticsPlugin",
+		"KeyboardPlugin"
+	]
 }