Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/great-toes-change.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@capacitor/background-runner": major
"example-app-spm": patch
"example-app": patch
---

chore!: Align plugin baselines with core
16 changes: 8 additions & 8 deletions .github/actions/setup-tools/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ runs:
using: "composite"
steps:
- name: Install Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v7
with:
node-version: 18
node-version: 24

- name: Install Java17
uses: actions/setup-java@v3
- name: Install Java21
uses: actions/setup-java@v5
with:
distribution: "temurin"
java-version: "17"
distribution: "zulu"
java-version: "21"

- name: Install PNPM
uses: pnpm/action-setup@v4
uses: pnpm/action-setup@v6
id: pnpm-install
with:
version: 10
Expand All @@ -36,7 +36,7 @@ runs:

- name: Setup PNPM cache
id: cache-pnpm-store
uses: actions/cache@v3
uses: actions/cache@v6
env:
STORE_PATH: ${{ env.STORE_PATH }}
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-cocoapods.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: macos-15
timeout-minutes: 30
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v7
- run: sudo xcode-select --switch /Applications/Xcode_14.1.app
- name: Install build dependencies
run: gem install cocoapods
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v7

- name: 'Setup Tools'
uses: ./.github/actions/setup-tools
Expand Down
11 changes: 3 additions & 8 deletions .github/workflows/reusable_build-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,21 @@ on:

jobs:
build:
runs-on: "ubuntu-22.04"
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v7
with:
fetch-depth: 0
token: ${{ secrets.CAP_GH_RELEASE_TOKEN || github.token }}

- name: "Setup Tools"
uses: ./.github/actions/setup-tools

- uses: nrwl/nx-set-shas@v3
- uses: nrwl/nx-set-shas@v5
with:
main-branch-name: "main"

- uses: actions/setup-java@v3
with:
distribution: "temurin"
java-version: "17"

- name: "Build Packages"
shell: bash
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/reusable_lint-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ on:

jobs:
lint:
runs-on: "macos-15"
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v7
with:
fetch-depth: 0
token: ${{ secrets.CAP_GH_RELEASE_TOKEN || github.token }}

- name: "Setup Tools"
uses: ./.github/actions/setup-tools

- uses: nrwl/nx-set-shas@v3
- uses: nrwl/nx-set-shas@v5
with:
main-branch-name: "main"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/reusable_release-npm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ on:

jobs:
release:
runs-on: 'ubuntu-22.04'
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v7
with:
fetch-depth: 0
token: ${{ secrets.CAP_GH_RELEASE_TOKEN }}
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/reusable_setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,15 @@ jobs:
setup:
strategy:
matrix:
os: ["ubuntu-22.04", "macos-15"]
os: ["ubuntu-latest", "macos-15"]
runs-on: ${{ matrix.os }}
timeout-minutes: 30
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v7
with:
fetch-depth: 0
token: ${{ secrets.CAP_GH_RELEASE_TOKEN || github.token }}

- uses: actions/setup-java@v3
with:
distribution: "temurin"
java-version: "17"

- name: "Setup Tools"
uses: ./.github/actions/setup-tools
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/reusable_unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ jobs:
- run: sudo xcode-select --switch /Applications/Xcode_26.0.app
- run: xcrun simctl list > /dev/null
- run: xcodebuild -downloadPlatform iOS
- uses: actions/checkout@v3
- uses: actions/checkout@v7
with:
fetch-depth: 0
token: ${{ secrets.CAP_GH_RELEASE_TOKEN || github.token }}
- name: Install PNPM
uses: pnpm/action-setup@v4
uses: pnpm/action-setup@v6
id: pnpm-install
with:
version: 10
Expand All @@ -35,7 +35,7 @@ jobs:
runs-on: macos-15-intel
timeout-minutes: 30
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v7
with:
fetch-depth: 0
token: ${{ secrets.CAP_GH_RELEASE_TOKEN || github.token }}
Expand Down
8 changes: 4 additions & 4 deletions apps/example-app-spm/ios/App/App.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -281,7 +281,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
Expand All @@ -298,7 +298,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
INFOPLIST_FILE = App/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -320,7 +320,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
INFOPLIST_FILE = App/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/example-app-spm/ios/App/App/AppDelegate.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import UIKit
import Capacitor

@UIApplicationMain
@main
class AppDelegate: UIResponder, UIApplicationDelegate {

var window: UIWindow?
Expand Down
13 changes: 6 additions & 7 deletions apps/example-app-spm/ios/App/CapApp-SPM/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,25 @@ import PackageDescription
// DO NOT MODIFY THIS FILE - managed by Capacitor CLI commands
let package = Package(
name: "CapApp-SPM",
platforms: [.iOS(.v15)],
platforms: [.iOS(.v16)],
products: [
.library(
name: "CapApp-SPM",
targets: ["CapApp-SPM"])
],
dependencies: [
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", exact: "8.0.0"),
.package(name: "CapacitorApp", path: "../../../../../node_modules/.pnpm/@capacitor+app@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/app"),
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", exact: "9.0.0-alpha.6"),
.package(name: "CapacitorApp", path: "../../../../../node_modules/.pnpm/@capacitor+app@9.0.0-alpha.2_@capacitor+core@9.0.0-alpha.6/node_modules/@capacitor/app"),
.package(name: "CapacitorBackgroundRunner", path: "../../../../../packages/capacitor-plugin"),
.package(name: "CapacitorHaptics", path: "../../../../../node_modules/.pnpm/@capacitor+haptics@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/haptics"),
.package(name: "CapacitorKeyboard", path: "../../../../../node_modules/.pnpm/@capacitor+keyboard@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/keyboard"),
.package(name: "CapacitorStatusBar", path: "../../../../../node_modules/.pnpm/@capacitor+status-bar@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/status-bar")
.package(name: "CapacitorHaptics", path: "../../../../../node_modules/.pnpm/@capacitor+haptics@9.0.0-next.1_@capacitor+core@9.0.0-alpha.6/node_modules/@capacitor/haptics"),
.package(name: "CapacitorKeyboard", path: "../../../../../node_modules/.pnpm/@capacitor+keyboard@9.0.0-next.1_@capacitor+core@9.0.0-alpha.6/node_modules/@capacitor/keyboard"),
.package(name: "CapacitorStatusBar", path: "../../../../../node_modules/.pnpm/@capacitor+status-bar@9.0.0-alpha.2_@capacitor+core@9.0.0-alpha.6/node_modules/@capacitor/status-bar")
],
targets: [
.target(
name: "CapApp-SPM",
dependencies: [
.product(name: "Capacitor", package: "capacitor-swift-pm"),
.product(name: "Cordova", package: "capacitor-swift-pm"),
.product(name: "CapacitorApp", package: "CapacitorApp"),
.product(name: "CapacitorBackgroundRunner", package: "CapacitorBackgroundRunner"),
.product(name: "CapacitorHaptics", package: "CapacitorHaptics"),
Expand Down
14 changes: 7 additions & 7 deletions apps/example-app-spm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
"dependencies": {
"@babel/plugin-syntax-flow": "^7.27.1",
"@babel/plugin-transform-react-jsx": "^7.27.1",
"@capacitor/app": "^8.0.0",
"@capacitor/app": "next",
"@capacitor/background-runner": "workspace:^",
"@capacitor/core": "^8.0.0",
"@capacitor/haptics": "^8.0.0",
"@capacitor/ios": "^8.0.0",
"@capacitor/keyboard": "^8.0.0",
"@capacitor/status-bar": "^8.0.0",
"@capacitor/core": "next",
"@capacitor/haptics": "next",
"@capacitor/ios": "next",
"@capacitor/keyboard": "next",
"@capacitor/status-bar": "next",
"@ionic/react": "^8.7.10",
"@ionic/react-router": "^8.7.10",
"@testing-library/dom": "^10.4.1",
Expand Down Expand Up @@ -70,7 +70,7 @@
]
},
"devDependencies": {
"@capacitor/cli": "^8.0.0"
"@capacitor/cli": "next"
},
"description": "An Ionic project"
}
4 changes: 1 addition & 3 deletions apps/example-app/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ android {
defaultConfig {
applicationId "io.ionic.starter"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -19,7 +18,7 @@ android {
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
}
Expand All @@ -40,7 +39,6 @@ dependencies {
testImplementation "junit:junit:$junitVersion"
androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
implementation project(':capacitor-cordova-android-plugins')
}

apply from: 'capacitor.build.gradle'
Expand Down
1 change: 0 additions & 1 deletion apps/example-app/android/app/capacitor.build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ android {
}
}

apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
dependencies {
implementation project(':capacitor-app')
implementation project(':capacitor-background-runner')
Expand Down
2 changes: 1 addition & 1 deletion apps/example-app/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
android:theme="@style/AppTheme">

<activity
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation|density"
android:name="io.ionic.starter.MainActivity"
android:label="@string/title_activity_main"
android:theme="@style/AppTheme.NoActionBarLaunch"
Expand Down
4 changes: 2 additions & 2 deletions apps/example-app/android/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.13.0'
classpath 'com.google.gms:google-services:4.4.4'
classpath 'com.android.tools.build:gradle:9.2.1'
classpath 'com.google.gms:google-services:4.5.0'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
11 changes: 6 additions & 5 deletions apps/example-app/android/capacitor.settings.gradle
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
include ':capacitor-android'
project(':capacitor-android').projectDir = new File('../../../node_modules/.pnpm/@capacitor+android@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/android/capacitor')
project(':capacitor-android').projectDir = new File('../../../node_modules/.pnpm/@capacitor+android@9.0.0-alpha.6_@capacitor+core@9.0.0-alpha.6/node_modules/@capacitor/android/capacitor')


include ':capacitor-app'
project(':capacitor-app').projectDir = new File('../../../node_modules/.pnpm/@capacitor+app@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/app/android')
project(':capacitor-app').projectDir = new File('../../../node_modules/.pnpm/@capacitor+app@9.0.0-alpha.2_@capacitor+core@9.0.0-alpha.6/node_modules/@capacitor/app/android')

include ':capacitor-background-runner'
project(':capacitor-background-runner').projectDir = new File('../../../packages/capacitor-plugin/android')

include ':capacitor-haptics'
project(':capacitor-haptics').projectDir = new File('../../../node_modules/.pnpm/@capacitor+haptics@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/haptics/android')
project(':capacitor-haptics').projectDir = new File('../../../node_modules/.pnpm/@capacitor+haptics@9.0.0-next.1_@capacitor+core@9.0.0-alpha.6/node_modules/@capacitor/haptics/android')

include ':capacitor-keyboard'
project(':capacitor-keyboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+keyboard@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/keyboard/android')
project(':capacitor-keyboard').projectDir = new File('../../../node_modules/.pnpm/@capacitor+keyboard@9.0.0-next.1_@capacitor+core@9.0.0-alpha.6/node_modules/@capacitor/keyboard/android')

include ':capacitor-status-bar'
project(':capacitor-status-bar').projectDir = new File('../../../node_modules/.pnpm/@capacitor+status-bar@8.0.0_@capacitor+core@8.0.0/node_modules/@capacitor/status-bar/android')
project(':capacitor-status-bar').projectDir = new File('../../../node_modules/.pnpm/@capacitor+status-bar@9.0.0-alpha.2_@capacitor+core@9.0.0-alpha.6/node_modules/@capacitor/status-bar/android')
Binary file modified apps/example-app/android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-all.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading