Skip to content

Commit

Permalink
Merge branch 'main' into feat/RDMR-296/statusbar-android15
Browse files Browse the repository at this point in the history
  • Loading branch information
andredestro authored Nov 26, 2024
2 parents eed0ff8 + 1ceecb0 commit d215f19
Show file tree
Hide file tree
Showing 74 changed files with 159 additions and 213 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-14]
os: [ubuntu-latest, macos-15]
timeout-minutes: 30
outputs:
plugins: ${{ steps.packages.outputs.paths }}
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
files: ${{ steps.catjson.outputs.FILES_JSON }}

lint-scripts:
runs-on: macos-14
runs-on: macos-15
timeout-minutes: 30
needs:
- setup
Expand All @@ -70,7 +70,7 @@ jobs:
- run: npm run lint

lint:
runs-on: macos-14
runs-on: macos-15
timeout-minutes: 30
needs:
- setup
Expand All @@ -97,7 +97,7 @@ jobs:
working-directory: ${{ matrix.plugin }}

verify-ios:
runs-on: macos-14
runs-on: macos-15
if: needs.setup.outputs.plugins != '[]'
timeout-minutes: 30
needs:
Expand All @@ -107,7 +107,7 @@ jobs:
strategy:
matrix:
xcode:
- /Applications/Xcode_15.0.app
- /Applications/Xcode_16.app
plugin: ${{ fromJson(needs.setup.outputs.plugins) }}
steps:
- run: sudo xcode-select --switch ${{ matrix.xcode }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ on:
required: true
jobs:
publish-ios:
runs-on: macos-14
runs-on: macos-15
if: github.event.inputs.plugins != '[]'
timeout-minutes: 30
strategy:
matrix:
plugin: ${{ fromJson(github.event.inputs.plugins) }}
steps:
- run: sudo xcode-select --switch /Applications/Xcode_15.0.app
- run: sudo xcode-select --switch /Applications/Xcode_16.app
- uses: actions/setup-node@v4
with:
node-version: 20
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-npm-alpha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ permissions:

jobs:
deploy-npm-alpha:
runs-on: macos-14
runs-on: macos-15
timeout-minutes: 30
steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-npm-beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ permissions:

jobs:
deploy-npm-beta:
runs-on: macos-14
runs-on: macos-15
timeout-minutes: 30
steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-npm-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ permissions:

jobs:
deploy-npm-dev:
runs-on: macos-14
runs-on: macos-15
timeout-minutes: 30
steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-npm-latest-from-pre.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ permissions:
jobs:
deploy-npm-latest-from-pre:
if: github.ref == 'refs/heads/main'
runs-on: macos-14
runs-on: macos-15
timeout-minutes: 30
steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-npm-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ permissions:
jobs:
deploy-npm-latest:
if: github.ref == 'refs/heads/main'
runs-on: macos-14
runs-on: macos-15
timeout-minutes: 30
steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-npm-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ permissions:
jobs:
deploy-npm-nightly:
if: github.ref == 'refs/heads/main'
runs-on: macos-14
runs-on: macos-15
timeout-minutes: 30
steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-npm-rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ permissions:

jobs:
deploy-npm-rc:
runs-on: macos-14
runs-on: macos-15
timeout-minutes: 30
steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion action-sheet/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ npx cap sync

This plugin will use the following project variables (defined in your app's `variables.gradle` file):

- `androidxMaterialVersion`: version of `com.google.android.material:material` (default: `1.10.0`)
- `androidxMaterialVersion`: version of `com.google.android.material:material` (default: `1.12.0`)

## PWA Notes

Expand Down
2 changes: 1 addition & 1 deletion action-sheet/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ext {
capacitorVersion = System.getenv('CAPACITOR_VERSION')
junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.0'
androidxMaterialVersion = project.hasProperty('androidxMaterialVersion') ? rootProject.ext.androidxMaterialVersion : '1.10.0'
androidxMaterialVersion = project.hasProperty('androidxMaterialVersion') ? rootProject.ext.androidxMaterialVersion : '1.12.0'
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.2.1'
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.6.1'
}
Expand Down
8 changes: 4 additions & 4 deletions action-sheet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
],
"scripts": {
"verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
"verify:ios": "xcodebuild build -scheme CapacitorActionSheet -sdk iphonesimulator17.0 -destination 'OS=17.0,name=iPhone 15'",
"verify:ios": "xcodebuild build -scheme CapacitorActionSheet -destination generic/platform=iOS",
"verify:android": "cd android && ./gradlew clean build test && cd ..",
"verify:web": "npm run build",
"lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",
Expand All @@ -40,7 +40,7 @@
"prettier": "prettier \"**/*.{css,html,ts,js,java}\"",
"swiftlint": "node-swiftlint",
"docgen": "docgen --api ActionSheetPlugin --output-readme README.md --output-json dist/docs.json",
"build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.js",
"build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.mjs",
"clean": "rimraf ./dist",
"watch": "tsc --watch",
"prepublishOnly": "npm run build",
Expand All @@ -57,8 +57,8 @@
"eslint": "^8.57.0",
"prettier": "~2.3.0",
"prettier-plugin-java": "~1.0.2",
"rimraf": "^3.0.0",
"rollup": "^2.29.0",
"rimraf": "^6.0.1",
"rollup": "^4.26.0",
"swiftlint": "^1.0.1",
"typescript": "~4.1.5"
},
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions app-launcher/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
],
"scripts": {
"verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
"verify:ios": "xcodebuild build -scheme CapacitorAppLauncher -sdk iphonesimulator17.0 -destination 'OS=17.0,name=iPhone 15'",
"verify:ios": "xcodebuild build -scheme CapacitorAppLauncher -destination generic/platform=iOS",
"verify:android": "cd android && ./gradlew clean build test && cd ..",
"verify:web": "npm run build",
"lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",
Expand All @@ -40,7 +40,7 @@
"prettier": "prettier \"**/*.{css,html,ts,js,java}\"",
"swiftlint": "node-swiftlint",
"docgen": "docgen --api AppLauncherPlugin --output-readme README.md --output-json dist/docs.json",
"build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.js",
"build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.mjs",
"clean": "rimraf ./dist",
"watch": "tsc --watch",
"prepublishOnly": "npm run build",
Expand All @@ -58,7 +58,7 @@
"prettier": "~2.3.0",
"prettier-plugin-java": "~1.0.2",
"rimraf": "^3.0.2",
"rollup": "^2.32.0",
"rollup": "^4.26.0",
"swiftlint": "^1.0.1",
"typescript": "~4.1.5"
},
Expand Down
File renamed without changes.
8 changes: 4 additions & 4 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
],
"scripts": {
"verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
"verify:ios": "xcodebuild build -scheme CapacitorApp -sdk iphonesimulator17.0 -destination 'OS=17.0,name=iPhone 15'",
"verify:ios": "xcodebuild build -scheme CapacitorApp -destination generic/platform=iOS",
"verify:android": "cd android && ./gradlew clean build test && cd ..",
"verify:web": "npm run build",
"lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",
Expand All @@ -40,7 +40,7 @@
"prettier": "prettier \"**/*.{css,html,ts,js,java}\"",
"swiftlint": "node-swiftlint",
"docgen": "docgen --api AppPlugin --output-readme README.md",
"build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.js",
"build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.mjs",
"clean": "rimraf ./dist",
"watch": "tsc --watch",
"prepublishOnly": "npm run build",
Expand All @@ -57,8 +57,8 @@
"eslint": "^8.57.0",
"prettier": "~2.3.0",
"prettier-plugin-java": "~1.0.2",
"rimraf": "^3.0.0",
"rollup": "^2.29.0",
"rimraf": "^6.0.1",
"rollup": "^4.26.0",
"swiftlint": "^1.0.1",
"typescript": "~4.1.5"
},
Expand Down
File renamed without changes.
12 changes: 0 additions & 12 deletions app/src/definitions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -275,15 +275,3 @@ export interface AppPlugin {
*/
removeAllListeners(): Promise<void>;
}

/**
* @deprecated Use `RestoredListenerEvent`.
* @since 1.0.0
*/
export type AppRestoredResult = RestoredListenerEvent;

/**
* @deprecated Use `URLOpenListenerEvent`.
* @since 1.0.0
*/
export type AppUrlOpen = URLOpenListenerEvent;
2 changes: 1 addition & 1 deletion browser/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ npx cap sync

This plugin will use the following project variables (defined in your app's `variables.gradle` file):

- `androidxBrowserVersion`: version of `androidx.browser:browser` (default: `1.7.0`)
- `androidxBrowserVersion`: version of `androidx.browser:browser` (default: `1.8.0`)

## Example

Expand Down
2 changes: 1 addition & 1 deletion browser/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ext {
androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.0'
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.2.1'
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.6.1'
androidxBrowserVersion = project.hasProperty('androidxBrowserVersion') ? rootProject.ext.androidxBrowserVersion : '1.7.0'
androidxBrowserVersion = project.hasProperty('androidxBrowserVersion') ? rootProject.ext.androidxBrowserVersion : '1.8.0'
}

buildscript {
Expand Down
8 changes: 4 additions & 4 deletions browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
],
"scripts": {
"verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
"verify:ios": "xcodebuild build -scheme CapacitorBrowser -sdk iphonesimulator17.0 -destination 'OS=17.0,name=iPhone 15'",
"verify:ios": "xcodebuild build -scheme CapacitorBrowser -destination generic/platform=iOS",
"verify:android": "cd android && ./gradlew clean build test && cd ..",
"verify:web": "npm run build",
"lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",
Expand All @@ -40,7 +40,7 @@
"prettier": "prettier \"**/*.{css,html,ts,js,java}\"",
"swiftlint": "node-swiftlint",
"docgen": "docgen --api BrowserPlugin --output-readme README.md --output-json dist/docs.json",
"build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.js",
"build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.mjs",
"clean": "rimraf ./dist",
"watch": "tsc --watch",
"prepublishOnly": "npm run build",
Expand All @@ -57,8 +57,8 @@
"eslint": "^8.57.0",
"prettier": "~2.3.0",
"prettier-plugin-java": "~1.0.2",
"rimraf": "^3.0.0",
"rollup": "^2.29.0",
"rimraf": "^6.0.1",
"rollup": "^4.26.0",
"swiftlint": "^1.0.1",
"typescript": "~4.1.5"
},
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions camera/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ Additionally, because the Camera API launches a separate Activity to handle taki

This plugin will use the following project variables (defined in your app's `variables.gradle` file):

- `androidxExifInterfaceVersion`: version of `androidx.exifinterface:exifinterface` (default: `1.3.6`)
- `androidxMaterialVersion`: version of `com.google.android.material:material` (default: `1.10.0`)
- `androidxExifInterfaceVersion`: version of `androidx.exifinterface:exifinterface` (default: `1.3.7`)
- `androidxMaterialVersion`: version of `com.google.android.material:material` (default: `1.12.0`)

## PWA Notes

Expand Down
4 changes: 2 additions & 2 deletions camera/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ ext {
junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.0'
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.6.1'
androidxExifInterfaceVersion = project.hasProperty('androidxExifInterfaceVersion') ? rootProject.ext.androidxExifInterfaceVersion : '1.3.6'
androidxExifInterfaceVersion = project.hasProperty('androidxExifInterfaceVersion') ? rootProject.ext.androidxExifInterfaceVersion : '1.3.7'
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.2.1'
androidxMaterialVersion = project.hasProperty('androidxMaterialVersion') ? rootProject.ext.androidxMaterialVersion : '1.10.0'
androidxMaterialVersion = project.hasProperty('androidxMaterialVersion') ? rootProject.ext.androidxMaterialVersion : '1.12.0'
}

buildscript {
Expand Down
8 changes: 4 additions & 4 deletions camera/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
],
"scripts": {
"verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
"verify:ios": "xcodebuild build -scheme CapacitorCamera -sdk iphonesimulator17.0 -destination 'OS=17.0,name=iPhone 15'",
"verify:ios": "xcodebuild build -scheme CapacitorCamera -destination generic/platform=iOS",
"verify:android": "cd android && ./gradlew clean build test && cd ..",
"verify:web": "npm run build",
"lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",
Expand All @@ -40,7 +40,7 @@
"prettier": "prettier \"**/*.{css,html,ts,js,java}\"",
"swiftlint": "node-swiftlint",
"docgen": "docgen --api CameraPlugin --output-readme README.md --output-json dist/docs.json",
"build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.js",
"build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.mjs",
"clean": "rimraf ./dist",
"watch": "tsc --watch",
"prepublishOnly": "npm run build",
Expand All @@ -57,8 +57,8 @@
"eslint": "^8.57.0",
"prettier": "~2.3.0",
"prettier-plugin-java": "~1.0.2",
"rimraf": "^3.0.0",
"rollup": "^2.29.0",
"rimraf": "^6.0.1",
"rollup": "^4.26.0",
"swiftlint": "^1.0.1",
"typescript": "~4.1.5"
},
Expand Down
File renamed without changes.
8 changes: 4 additions & 4 deletions clipboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
],
"scripts": {
"verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
"verify:ios": "xcodebuild build -scheme CapacitorClipboard -sdk iphonesimulator17.0 -destination 'OS=17.0,name=iPhone 15'",
"verify:ios": "xcodebuild build -scheme CapacitorClipboard -destination generic/platform=iOS",
"verify:android": "cd android && ./gradlew clean build test && cd ..",
"verify:web": "npm run build",
"lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",
Expand All @@ -40,7 +40,7 @@
"prettier": "prettier \"**/*.{css,html,ts,js,java}\"",
"swiftlint": "node-swiftlint",
"docgen": "docgen --api ClipboardPlugin --output-readme README.md --output-json dist/docs.json",
"build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.js",
"build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.mjs",
"clean": "rimraf ./dist",
"watch": "tsc --watch",
"prepublishOnly": "npm run build",
Expand All @@ -57,8 +57,8 @@
"eslint": "^8.57.0",
"prettier": "~2.3.0",
"prettier-plugin-java": "~1.0.2",
"rimraf": "^3.0.0",
"rollup": "^2.29.0",
"rimraf": "^6.0.1",
"rollup": "^4.26.0",
"swiftlint": "^1.0.1",
"typescript": "~4.1.5"
},
Expand Down
File renamed without changes.
Loading

0 comments on commit d215f19

Please sign in to comment.