Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MOBILE-4729] Add missing MC methods in android old arch #600

Merged
merged 6 commits into from
Oct 9, 2024
Merged
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
33 changes: 33 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,36 @@ jobs:
- run: npm run bootstrap
- run: bash ./scripts/run_ci_tasks.sh -i
- run: bash ./scripts/run_ci_tasks.sh -a

test-android-old-arch:
runs-on: macos-13-xlarge
steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'

- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.0.1'

- name: Install CocoaPods
run: gem install cocoapods -v '1.15.2'

- name: Select Xcode version
run: sudo xcode-select -s '/Applications/Xcode_15.2.app/Contents/Developer'

- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version-file: .nvmrc
cache: 'npm'

- run: sed -i '' 's/newArchEnabled=true/newArchEnabled=false/' example/android/gradle.properties
- run: npm run bootstrap
- run: bash ./scripts/run_ci_tasks.sh -a


6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# React Native Module Changelog

## Version 19.4.1 - October 9, 2024
Patch release to fix a compile issue with the old Architecture on Android.

### Changes
- Fixed compile issue when using old architecture on Android.

## Version 19.4.0 - October 4, 2024

### Changes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -634,12 +634,14 @@ class AirshipModule internal constructor(val context: ReactApplicationContext) :
proxy.messageCenter.setAutoLaunchDefaultMessageCenter(enabled)
}

@ReactMethod
override fun messageCenterShowMessageCenter(messageId: String?, promise: Promise) {
promise.resolveResult {
proxy.messageCenter.showMessageCenter(messageId)
}
}

@ReactMethod
override fun messageCenterShowMessageView(messageId: String?, promise: Promise) {
promise.resolveResult {
proxy.messageCenter.showMessageView(requireNotNull(messageId))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,14 @@ abstract class AirshipSpec internal constructor(context: ReactApplicationContext
@com.facebook.proguard.annotations.DoNotStrip
abstract fun messageCenterSetAutoLaunchDefaultMessageCenter(enabled: Boolean)

@ReactMethod
@com.facebook.proguard.annotations.DoNotStrip
abstract fun messageCenterShowMessageCenter(messageId: String?, promise: Promise)

@ReactMethod
@com.facebook.proguard.annotations.DoNotStrip
abstract fun messageCenterShowMessageView(messageId: String?, promise: Promise)

@ReactMethod
@com.facebook.proguard.annotations.DoNotStrip
abstract fun preferenceCenterDisplay(
Expand Down
4 changes: 2 additions & 2 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -907,7 +907,7 @@ PODS:
- React-Mapbuffer (0.73.4):
- glog
- React-debug
- react-native-airship (19.4.0):
- react-native-airship (19.4.1):
- AirshipFrameworkProxy (= 10.0.0)
- glog
- RCT-Folly (= 2022.05.16.00)
Expand Down Expand Up @@ -1311,7 +1311,7 @@ SPEC CHECKSUMS:
React-jsinspector: 9ac353eccf6ab54d1e0a33862ba91221d1e88460
React-logger: 0a57b68dd2aec7ff738195f081f0520724b35dab
React-Mapbuffer: 63913773ed7f96b814a2521e13e6d010282096ad
react-native-airship: 4a8f69108b353db26bf57c47a247c819c63889f8
react-native-airship: d8f5b6cd7f62135b13c31a5f2b2b4eb144819166
react-native-safe-area-context: b97eb6f9e3b7f437806c2ce5983f479f8eb5de4b
React-nativeconfig: d7af5bae6da70fa15ce44f045621cf99ed24087c
React-NativeModulesApple: 0123905d5699853ac68519607555a9a4f5c7b3ac
Expand Down
2 changes: 1 addition & 1 deletion ios/AirshipReactNative.swift
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public class AirshipReactNative: NSObject {
AirshipProxy.shared
}

public static let version: String = "19.4.0"
public static let version: String = "19.4.1"

private let eventNotifier = EventNotifier()

Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ua/react-native-airship",
"version": "19.4.0",
"version": "19.4.1",
"description": "Airship plugin for React Native apps.",
"main": "lib/commonjs/index",
"module": "lib/module/index",
Expand Down
Loading