Merge branch 'main' into feat/silent-local-notifications

ionic-team · Jul 24, 2024 · 3522582 · 3522582
2 parents 011aa1f + 33bdae1
commit 3522582
Show file tree

Hide file tree

Showing 732 changed files with 2,672 additions and 35,354 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-13]
+        os: [ubuntu-latest, macos-14]
     timeout-minutes: 30
     outputs:
       plugins: ${{ steps.packages.outputs.paths }}
@@ -51,7 +51,7 @@ jobs:
          files: ${{ steps.catjson.outputs.FILES_JSON }}
 
   lint-scripts:
-    runs-on: macos-13
+    runs-on: macos-14
     timeout-minutes: 30
     needs:
       - setup
@@ -74,7 +74,7 @@ jobs:
       - run: npm run lint
 
   lint:
-    runs-on: macos-13
+    runs-on: macos-14
     timeout-minutes: 30
     needs:
       - setup
@@ -103,7 +103,7 @@ jobs:
         working-directory: ${{ matrix.plugin }}
 
   verify-ios:
-    runs-on: macos-13
+    runs-on: macos-14
     if: needs.setup.outputs.plugins != '[]'
     timeout-minutes: 30
     needs:

diff --git a/.github/workflows/publish-ios.yml b/.github/workflows/publish-ios.yml
@@ -8,7 +8,7 @@ on:
         required: true
 jobs:
   publish-ios:
-    runs-on: macos-13
+    runs-on: macos-14
     if: github.event.inputs.plugins != '[]'
     timeout-minutes: 30
     strategy:

diff --git a/.github/workflows/publish-npm-alpha.yml b/.github/workflows/publish-npm-alpha.yml
@@ -8,7 +8,7 @@ permissions:
 
 jobs:
   deploy-npm-alpha:
-    runs-on: macos-13
+    runs-on: macos-14
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/publish-npm-beta.yml b/.github/workflows/publish-npm-beta.yml
@@ -8,7 +8,7 @@ permissions:
 
 jobs:
   deploy-npm-beta:
-    runs-on: macos-13
+    runs-on: macos-14
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/publish-npm-dev.yml b/.github/workflows/publish-npm-dev.yml
@@ -8,7 +8,7 @@ permissions:
 
 jobs:
   deploy-npm-dev:
-    runs-on: macos-13
+    runs-on: macos-14
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/publish-npm-latest-from-pre.yml b/.github/workflows/publish-npm-latest-from-pre.yml
@@ -16,7 +16,7 @@ permissions:
 jobs:
   deploy-npm-latest-from-pre:
     if: github.ref == 'refs/heads/main'
-    runs-on: macos-13
+    runs-on: macos-14
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/publish-npm-latest.yml b/.github/workflows/publish-npm-latest.yml
@@ -16,7 +16,7 @@ permissions:
 jobs:
   deploy-npm-latest:
     if: github.ref == 'refs/heads/main'
-    runs-on: macos-13
+    runs-on: macos-14
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/publish-npm-nightly.yml b/.github/workflows/publish-npm-nightly.yml
@@ -11,7 +11,7 @@ permissions:
 jobs:
   deploy-npm-nightly:
     if: github.ref == 'refs/heads/main'
-    runs-on: macos-13
+    runs-on: macos-14
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/publish-npm-rc.yml b/.github/workflows/publish-npm-rc.yml
@@ -8,7 +8,7 @@ permissions:
 
 jobs:
   deploy-npm-rc:
-    runs-on: macos-13
+    runs-on: macos-14
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v3

diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@ node_modules
 .DS_Store
 package-lock.json
 Podfile.lock
-.env
+Package.resolved
+.env
diff --git a/README.md b/README.md
@@ -24,7 +24,6 @@ This repository contains the official Capacitor plugins maintained by the Capaci
 | [`@capacitor/dialog`](https://capacitorjs.com/docs/apis/dialog) | [`./dialog`](./dialog) | [![npm badge](https://img.shields.io/npm/v/@capacitor/dialog?style=flat-square)](https://www.npmjs.com/package/@capacitor/dialog)
 | [`@capacitor/filesystem`](https://capacitorjs.com/docs/apis/filesystem) | [`./filesystem`](./filesystem) | [![npm badge](https://img.shields.io/npm/v/@capacitor/filesystem?style=flat-square)](https://www.npmjs.com/package/@capacitor/filesystem)
 | [`@capacitor/geolocation`](https://capacitorjs.com/docs/apis/geolocation) | [`./geolocation`](./geolocation) | [![npm badge](https://img.shields.io/npm/v/@capacitor/geolocation?style=flat-square)](https://www.npmjs.com/package/@capacitor/geolocation)
-| [`@capacitor/google-maps`](https://capacitorjs.com/docs/apis/google-maps) | [`./google-maps`](./google-maps) | [![npm badge](https://img.shields.io/npm/v/@capacitor/google-maps?style=flat-square)](https://www.npmjs.com/package/@capacitor/google-maps)
 | [`@capacitor/haptics`](https://capacitorjs.com/docs/apis/haptics) | [`./haptics`](./haptics) | [![npm badge](https://img.shields.io/npm/v/@capacitor/haptics?style=flat-square)](https://www.npmjs.com/package/@capacitor/haptics)
 | [`@capacitor/keyboard`](https://capacitorjs.com/docs/apis/keyboard) | [`./keyboard`](./keyboard) | [![npm badge](https://img.shields.io/npm/v/@capacitor/keyboard?style=flat-square)](https://www.npmjs.com/package/@capacitor/keyboard)
 | [`@capacitor/local-notifications`](https://capacitorjs.com/docs/apis/local-notifications) | [`./local-notifications`](./local-notifications) | [![npm badge](https://img.shields.io/npm/v/@capacitor/local-notifications?style=flat-square)](https://www.npmjs.com/package/@capacitor/local-notifications)
@@ -47,6 +46,7 @@ These are official Capacitor plugins that are not contained in this repository.
 | GitHub | Package | Version |
 | --- | --- | --- |
 | [Background Runner](https://github.com/ionic-team/capacitor-background-runner) | [`@capacitor/background-runner`](https://capacitorjs.com/docs/apis/background-runner) | [![npm badge](https://img.shields.io/npm/v/@capacitor/background-runner?style=flat-square)](https://www.npmjs.com/package/@capacitor/background-runner) |
+| [Google Maps](https://github.com/ionic-team/capacitor-google-maps) | [`@capacitor/google-maps`](https://capacitorjs.com/docs/apis/google-maps) | [![npm badge](https://img.shields.io/npm/v/@capacitor/google-maps?style=flat-square)](https://www.npmjs.com/package/@capacitor/google-maps) |
 
 ## Capacitor Labs
 

diff --git a/action-sheet/.gitignore b/action-sheet/.gitignore
@@ -5,8 +5,16 @@ node_modules
 # iOS files
 Pods
 Podfile.lock
+Package.resolved
 Build
 xcuserdata
+/.build
+/Packages
+xcuserdata/
+DerivedData/
+.swiftpm/configuration/registries.json
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+.netrc
 
 # macOS files
 .DS_Store

diff --git a/action-sheet/CHANGELOG.md b/action-sheet/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.0.1](https://github.com/ionic-team/capacitor-plugins/compare/@capacitor/[email protected]...@capacitor/[email protected]) (2024-06-13)
+
+**Note:** Version bump only for package @capacitor/action-sheet
+
+# [6.0.0](https://github.com/ionic-team/capacitor-plugins/compare/@capacitor/[email protected]...@capacitor/[email protected]) (2024-04-15)
+
+**Note:** Version bump only for package @capacitor/action-sheet
+
+# [6.0.0-rc.1](https://github.com/ionic-team/capacitor-plugins/compare/@capacitor/[email protected]...@capacitor/[email protected]) (2024-03-25)
+
+**Note:** Version bump only for package @capacitor/action-sheet
+
+# [6.0.0-rc.0](https://github.com/ionic-team/capacitor-plugins/compare/@capacitor/[email protected]...@capacitor/[email protected]) (2024-02-07)
+
+**Note:** Version bump only for package @capacitor/action-sheet
+
+# [6.0.0-beta.1](https://github.com/ionic-team/capacitor-plugins/compare/@capacitor/[email protected]...@capacitor/[email protected]) (2023-12-14)
+
+**Note:** Version bump only for package @capacitor/action-sheet
+
+# [6.0.0-beta.0](https://github.com/ionic-team/capacitor-plugins/compare/@capacitor/[email protected]...@capacitor/[email protected]) (2023-12-13)
+
+**Note:** Version bump only for package @capacitor/action-sheet
+
 # [6.0.0-alpha.2](https://github.com/ionic-team/capacitor-plugins/compare/@capacitor/[email protected]...@capacitor/[email protected]) (2023-11-15)
 
 **Note:** Version bump only for package @capacitor/action-sheet

diff --git a/action-sheet/CapacitorActionSheet.podspec b/action-sheet/CapacitorActionSheet.podspec
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.homepage = 'https://capacitorjs.com'
   s.author = package['author']
   s.source = { :git => 'https://github.com/ionic-team/capacitor-plugins.git', :tag => package['name'] + '@' + package['version'] }
-  s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}', 'action-sheet/ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
+  s.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}', 'action-sheet/ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
   s.ios.deployment_target  = '13.0'
   s.dependency 'Capacitor'
   s.swift_version = '5.1'

diff --git a/action-sheet/Package.swift b/action-sheet/Package.swift
@@ -0,0 +1,28 @@
+// swift-tools-version: 5.9
+import PackageDescription
+
+let package = Package(
+    name: "CapacitorActionSheet",
+    platforms: [.iOS(.v13)],
+    products: [
+        .library(
+            name: "CapacitorActionSheet",
+            targets: ["ActionSheetPlugin"])
+    ],
+    dependencies: [
+        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", branch: "main")
+    ],
+    targets: [
+        .target(
+            name: "ActionSheetPlugin",
+            dependencies: [
+                .product(name: "Capacitor", package: "capacitor-swift-pm"),
+                .product(name: "Cordova", package: "capacitor-swift-pm")
+            ],
+            path: "ios/Sources/ActionSheetPlugin"),
+        .testTarget(
+            name: "ActionSheetPluginTests",
+            dependencies: ["ActionSheetPlugin"],
+            path: "ios/Tests/ActionSheetPluginTests")
+    ]
+)
diff --git a/action-sheet/android/build.gradle b/action-sheet/android/build.gradle
@@ -16,7 +16,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.0-rc02'
+        classpath 'com.android.tools.build:gradle:8.2.1'
         if (System.getenv("CAP_PLUGIN_PUBLISH") == "true") {
             classpath 'io.github.gradle-nexus:publish-plugin:1.3.0'
         }

diff --git a/action-sheet/ios/.gitignore b/action-sheet/ios/.gitignore
@@ -0,0 +1,8 @@
+.DS_Store
+/.build
+/Packages
+xcuserdata/
+DerivedData/
+.swiftpm/configuration/registries.json
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+.netrc