Skip to content

Commit

Permalink
Merge pull request #25 from urbanairship/release-3.1.0
Browse files Browse the repository at this point in the history
Release 3.1.0
  • Loading branch information
crow authored Dec 7, 2024
2 parents a549566 + c9284cb commit 952bdae
Show file tree
Hide file tree
Showing 13 changed files with 1,211 additions and 260 deletions.
30 changes: 20 additions & 10 deletions .github/workflows/CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,27 @@ name: CI

on: [pull_request]

concurrency:
group: ${{ github.ref }}
cancel-in-progress: true

jobs:
verify:
runs-on: macos-13-xlarge
timeout-minutes: 10
env:
DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
test:
runs-on: macos-15-xlarge
steps:
- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.0.1'
- name: Install CocoaPods and xcpretty
run: |
gem install cocoapods -v '1.16.1'
gem install xcpretty
- name: Select Xcode version
run: sudo xcode-select -s '/Applications/Xcode_16.1.app/Contents/Developer'
- uses: actions/setup-node@v4
with:
node-version: '18'
registry-url: 'https://registry.npmjs.org'
- name: Run CI
run: npm ci && npm run verify
run: |
set -eo pipefail
npm ci --no-save --registry=https://registry.npmjs.org/
npm run verify | xcpretty --color
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,4 @@ captures

# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild
.build
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Capacitor Plugin Changelog

## Version 3.1.0 - December 6, 2024
Minor release that updates the Android Airship SDK to 18.5.0 and iOS Airship SDK to 18.13.0

### Changes
- Updated Android SDK to [18.5.0](https://github.com/urbanairship/android-library/releases/tag/18.5.0).
- Updated iOS SDK to [18.13.0](https://github.com/urbanairship/ios-library/releases/tag/18.13.0).

## Version 3.0.1 - November 26, 2024
Patch release that updates the iOS Airship SDK to 18.12.2 and Android Airship SDK to 18.4.2
Expand Down
10 changes: 10 additions & 0 deletions DEV_README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Capacitor Airship Plugin Dev Readme

Failing `npm run verify`?

Try this from root directory:
`rm -rf node_modules package-lock.json ios/Pods ios/Podfile.lock`
`npm cache clean --force`
`npm install`
`cd ios && pod install`

8 changes: 4 additions & 4 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/urbanairship/airship-mobile-framework-proxy.git",
"state" : {
"revision" : "3a374446d1aa59a1115f886b66f552fa25e00788",
"version" : "11.0.6"
"revision" : "8e048c42ae59ab5123fe5416b7eada78e9d4baee",
"version" : "11.1.0"
}
},
{
Expand All @@ -23,8 +23,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/urbanairship/ios-library.git",
"state" : {
"revision" : "fdca25d25a26c9f979f9e2ec739c7e5f298b77ca",
"version" : "18.12.2"
"revision" : "694217c943850a25618a8a5fc9478cfdfcc8e38e",
"version" : "18.13.0"
}
}
],
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let package = Package(
],
dependencies: [
.package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", branch: "main"),
.package(url: "https://github.com/urbanairship/airship-mobile-framework-proxy.git", from: "11.0.6")
.package(url: "https://github.com/urbanairship/airship-mobile-framework-proxy.git", from: "11.1.0")
],
targets: [
.target(
Expand Down
2 changes: 1 addition & 1 deletion UaCapacitorAirship.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ Pod::Spec.new do |s|
s.ios.deployment_target = '14.0'
s.dependency 'Capacitor'
s.swift_version = '5.1'
s.dependency "AirshipFrameworkProxy", "11.0.6"
s.dependency "AirshipFrameworkProxy", "11.1.0"
s.source_files = 'ios/Plugin/**/*.{swift,h,m,c,cc,mm,cpp}'
end
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ext {
airshipProxyVersion = project.hasProperty('airshipProxyVersion') ? rootProject.ext.airshipProxyVersion : '11.0.6'
airshipProxyVersion = project.hasProperty('airshipProxyVersion') ? rootProject.ext.airshipProxyVersion : '11.1.0'
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
package com.airship.capacitor

object AirshipCapacitorVersion {
var version = "3.0.1"
var version = "3.1.0"
}
2 changes: 1 addition & 1 deletion ios/Plugin/AirshipCapacitorVersion.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
import Foundation

class AirshipCapacitorVersion {
static let version = "3.0.1"
static let version = "3.1.0"
}
2 changes: 1 addition & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ def capacitor_pods
use_frameworks!
pod 'Capacitor', :path => '../node_modules/@capacitor/ios'
pod 'CapacitorCordova', :path => '../node_modules/@capacitor/ios'
pod 'AirshipFrameworkProxy', '11.0.6'
pod 'AirshipFrameworkProxy', '11.1.0'
end

target 'Plugin' do
Expand Down
Loading

0 comments on commit 952bdae

Please sign in to comment.