Skip to content

Commit

Permalink
Merge branch 'main' into fix/enable-nav-gestures-ios
Browse files Browse the repository at this point in the history
  • Loading branch information
MegaMaddin authored Jan 2, 2025
2 parents 64fb6c4 + 9d08df6 commit 34bfd5a
Show file tree
Hide file tree
Showing 171 changed files with 1,903 additions and 4,604 deletions.
44 changes: 0 additions & 44 deletions .eslintrc.js

This file was deleted.

37 changes: 13 additions & 24 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,44 +23,39 @@ jobs:
- name: Get Latest
uses: actions/setup-node@v4
with:
node-version: 18.x
- name: NPM ^9.5.0
run: npm i -g npm@^9.5.0 --registry=https://registry.npmjs.org
node-version: 20.x
- uses: actions/checkout@v4
- name: Restore Dependency Cache
uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.OS }}-dependencies-cache-${{ hashFiles('**/package.json') }}
lint:
runs-on: macos-14
runs-on: macos-15
timeout-minutes: 30
steps:
- uses: actions/setup-node@v4
with:
node-version: 18.x
- name: NPM ^9.5.0
run: npm i -g npm@^9.5.0 --registry=https://registry.npmjs.org
node-version: 20.x
- uses: actions/checkout@v4
- name: Restore Dependency Cache
uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.OS }}-dependencies-cache-${{ hashFiles('**/package.json') }}
- run: npm install
- run: brew install swiftlint
- run: npm run lint
test-cli:
runs-on: macos-14
runs-on: macos-15
timeout-minutes: 30
needs:
- setup
- lint
steps:
- uses: actions/setup-node@v4
with:
node-version: 18.x
- name: NPM ^9.5.0
run: npm i -g npm@^9.5.0 --registry=https://registry.npmjs.org
node-version: 20.x
- uses: actions/checkout@v4
- name: Restore Dependency Cache
uses: actions/cache@v4
Expand All @@ -81,9 +76,7 @@ jobs:
steps:
- uses: actions/setup-node@v4
with:
node-version: 18.x
- name: NPM ^9.5.0
run: npm i -g npm@^9.5.0 --registry=https://registry.npmjs.org
node-version: 20.x
- uses: actions/checkout@v4
- name: Restore Dependency Cache
uses: actions/cache@v4
Expand All @@ -96,22 +89,20 @@ jobs:
- run: npm test
working-directory: ./core
test-ios:
runs-on: macos-14
runs-on: macos-15
timeout-minutes: 30
needs:
- setup
- lint
strategy:
matrix:
xcode:
- /Applications/Xcode_15.0.1.app
- /Applications/Xcode_16.app
steps:
- run: sudo xcode-select --switch ${{ matrix.xcode }}
- uses: actions/setup-node@v4
with:
node-version: 18.x
- name: NPM ^9.5.0
run: npm i -g npm@^9.5.0 --registry=https://registry.npmjs.org
node-version: 20.x
- uses: actions/checkout@v4
- name: Restore Dependency Cache
uses: actions/cache@v4
Expand All @@ -132,14 +123,12 @@ jobs:
steps:
- uses: actions/setup-node@v4
with:
node-version: 18.x
- name: set up JDK 17
node-version: 20.x
- name: set up JDK 21
uses: actions/setup-java@v4
with:
java-version: '17'
java-version: '21'
distribution: 'zulu'
- name: NPM ^9.5.0
run: npm i -g npm@^9.5.0 --registry=https://registry.npmjs.org
- uses: actions/checkout@v4
- name: Restore Dependency Cache
uses: actions/cache@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ jobs:
fetch-depth: 0
ref: 'main'
token: ${{ secrets.CAP_GH_RELEASE_TOKEN }}
- name: set up JDK 17
- name: set up JDK 21
uses: actions/setup-java@v4
with:
java-version: '17'
java-version: '21'
distribution: 'zulu'
- name: Grant execute permission for gradlew
run: chmod +x ./android/gradlew
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/publish-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,13 @@ on:

jobs:
publish-ios:
runs-on: macos-14
runs-on: macos-15
timeout-minutes: 30
steps:
- run: sudo xcode-select --switch /Applications/Xcode_15.0.1.app
- run: sudo xcode-select --switch /Applications/Xcode_16.app
- uses: actions/setup-node@v4
with:
node-version: 18.x
- name: NPM ^9.5.0
run: npm i -g npm@^9.5.0 --registry=https://registry.npmjs.org
node-version: 20.x
- uses: actions/checkout@v4
with:
fetch-depth: 0
Expand Down
6 changes: 3 additions & 3 deletions .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@v4
Expand All @@ -17,12 +17,12 @@ jobs:
token: ${{ secrets.CAP_GH_RELEASE_TOKEN }}
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
registry-url: https://registry.npmjs.org/
cache: npm
cache-dependency-path: '**/package.json'
- run: |
npm install
npm install --force
- name: Version & Publish
env:
GH_TOKEN: ${{ secrets.CAP_GH_RELEASE_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .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@v4
Expand All @@ -17,7 +17,7 @@ jobs:
token: ${{ secrets.CAP_GH_RELEASE_TOKEN }}
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
registry-url: https://registry.npmjs.org/
cache: npm
cache-dependency-path: '**/package.json'
Expand Down
4 changes: 2 additions & 2 deletions .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@v4
Expand All @@ -17,7 +17,7 @@ jobs:
token: ${{ secrets.CAP_GH_RELEASE_TOKEN }}
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
registry-url: https://registry.npmjs.org/
cache: npm
cache-dependency-path: '**/package.json'
Expand Down
4 changes: 2 additions & 2 deletions .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:
if: github.ref == 'refs/heads/main'
runs-on: macos-14
runs-on: macos-15
timeout-minutes: 30
steps:
- uses: actions/checkout@v4
Expand All @@ -25,7 +25,7 @@ jobs:
token: ${{ secrets.CAP_GH_RELEASE_TOKEN }}
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
registry-url: https://registry.npmjs.org/
cache: npm
cache-dependency-path: '**/package.json'
Expand Down
4 changes: 2 additions & 2 deletions .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@v4
Expand All @@ -25,7 +25,7 @@ jobs:
token: ${{ secrets.CAP_GH_RELEASE_TOKEN }}
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
registry-url: https://registry.npmjs.org/
cache: npm
cache-dependency-path: '**/package.json'
Expand Down
4 changes: 2 additions & 2 deletions .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@v4
Expand All @@ -20,7 +20,7 @@ jobs:
token: ${{ secrets.CAP_GH_RELEASE_TOKEN }}
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
registry-url: https://registry.npmjs.org/
cache: npm
cache-dependency-path: '**/package.json'
Expand Down
4 changes: 2 additions & 2 deletions .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@v4
Expand All @@ -17,7 +17,7 @@ jobs:
token: ${{ secrets.CAP_GH_RELEASE_TOKEN }}
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
registry-url: https://registry.npmjs.org/
cache: npm
cache-dependency-path: '**/package.json'
Expand Down
39 changes: 38 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,41 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [7.0.0-rc.0](https://github.com/ionic-team/capacitor/compare/7.0.0-beta.0...7.0.0-rc.0) (2024-12-20)

**Note:** Version bump only for package capacitor

# [7.0.0-beta.0](https://github.com/ionic-team/capacitor/compare/7.0.0-alpha.2...7.0.0-beta.0) (2024-12-20)

### Bug Fixes

- **cli:** correct rimraf import ([#7811](https://github.com/ionic-team/capacitor/issues/7811)) ([0891624](https://github.com/ionic-team/capacitor/commit/0891624c46b78a0fd39f617f834d5cdd1f54f5e6))
- **cli:** update link to telemetry information ([e922e2b](https://github.com/ionic-team/capacitor/commit/e922e2b718f5c6f2e4062cdccdeb92da3321e67d))
- **ios:** Make Bridge webView first responder ([#7753](https://github.com/ionic-team/capacitor/issues/7753)) ([77e4668](https://github.com/ionic-team/capacitor/commit/77e4668fa8dbb24b4561387e101547f74e37538e))

### Features

- Add global initialFocus configuration ([#7775](https://github.com/ionic-team/capacitor/issues/7775)) ([61d0165](https://github.com/ionic-team/capacitor/commit/61d01653685d8e3594d2d8a6bd870fa9643ba95c))

# [7.0.0-alpha.2](https://github.com/ionic-team/capacitor/compare/7.0.0-alpha.1...7.0.0-alpha.2) (2024-11-19)

### Bug Fixes

- **cli:** make Cordova plugins use same default kotlin version as Capacitor ([#7752](https://github.com/ionic-team/capacitor/issues/7752)) ([a4aeb55](https://github.com/ionic-team/capacitor/commit/a4aeb55720ecc83b3870bf32bf9825d6aee4644f))

# [7.0.0-alpha.1](https://github.com/ionic-team/capacitor/compare/6.1.2...7.0.0-alpha.1) (2024-10-14)

### Bug Fixes

- **android-template:** prevent app restart on bluetooh keyboard changes ([#7652](https://github.com/ionic-team/capacitor/issues/7652)) ([200c7cb](https://github.com/ionic-team/capacitor/commit/200c7cb911898fbfb12b0b25e8cfd1982e0a6bf0))
- **cli:** replace app-store deprecated method on build ([#7637](https://github.com/ionic-team/capacitor/issues/7637)) ([942b108](https://github.com/ionic-team/capacitor/commit/942b108c1d506539c0c53276ed4ec35eed36634e))
- **ios:** fix retain cycle caused by CDVPluginManager ([#7692](https://github.com/ionic-team/capacitor/issues/7692)) ([02bdb3d](https://github.com/ionic-team/capacitor/commit/02bdb3d1d15907dcc577f16b7f2e22050e54ffef))

### Features

- **core:** expose `methodName` via `CAPPluginCall` ([#7641](https://github.com/ionic-team/capacitor/issues/7641)) ([df109aa](https://github.com/ionic-team/capacitor/commit/df109aa1cfa1ea824e22feecbd2b7183a57fc693))
- **ios:** JSValueEncoder/Decoder feature parity with JSONEncoder/Decoder ([#7647](https://github.com/ionic-team/capacitor/issues/7647)) ([410249b](https://github.com/ionic-team/capacitor/commit/410249b6c626e67235f25b466ed4969d52148bd1)), closes [#7576](https://github.com/ionic-team/capacitor/issues/7576)

## [6.1.2](https://github.com/ionic-team/capacitor/compare/6.1.1...6.1.2) (2024-08-07)

### Bug Fixes
Expand Down Expand Up @@ -297,7 +332,9 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline

- **android:** add check for excluded domains before ssl request ([7906d36](https://github.com/ionic-team/capacitor/commit/7906d3616e8bfb2e2c1c81ee123424c06fc4e5ab))
- **cli:** add apksigner as a build option ([#6442](https://github.com/ionic-team/capacitor/issues/6442)) ([9818a76](https://github.com/ionic-team/capacitor/commit/9818a76ab4ea6660b444354f239344d37c77d3b3))
- export buildRequestInit function so we can use for downloadFile ([95b0575](https://github.com/ionic-team/capacitor/commit/95b0575e3fbc1b1408aa69b61c58e18bf8882cea))
- export buildRequestInit function so we can use for downloadFile ([95b0575](https://github.com/ionic-team/capacitor/commit/95b0575e3fbc1b1408aa69b61c58e18bf8882cea)

)

## [5.0.5](https://github.com/ionic-team/capacitor/compare/5.0.4...5.0.5) (2023-06-09)

Expand Down
2 changes: 1 addition & 1 deletion android-template/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
android:theme="@style/AppTheme">

<activity
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation"
android:name=".MainActivity"
android:label="@string/title_activity_main"
android:theme="@style/AppTheme.NoActionBarLaunch"
Expand Down
4 changes: 2 additions & 2 deletions android-template/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.2.1'
classpath 'com.google.gms:google-services:4.4.0'
classpath 'com.android.tools.build:gradle:8.7.2'
classpath 'com.google.gms:google-services:4.4.2'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
Binary file modified android-template/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion android-template/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading

0 comments on commit 34bfd5a

Please sign in to comment.