diff --git a/.github/workflows/complete-release.yml b/.github/workflows/complete-release.yml index 41fd250..f1d3e68 100644 --- a/.github/workflows/complete-release.yml +++ b/.github/workflows/complete-release.yml @@ -10,7 +10,7 @@ on: jobs: tag-and-release: # Run only after release PR branch is merged - if: github.event.pull_request.merged == true && startsWith(github.head_ref, 'releases/') + if: github.event.pull_request.merged == true && github.head_ref == 'develop' runs-on: ubuntu-latest steps: - name: Checkout diff --git a/.scripts/changes.md b/.scripts/changes.md index 44fcf54..f617539 100644 --- a/.scripts/changes.md +++ b/.scripts/changes.md @@ -1,2 +1,2 @@ -- Apptentive Android SDK: 6.7.0 -- Apptentive iOS SDK: 6.7.0 \ No newline at end of file +- Apptentive Android SDK: 6.8.0 +- Apptentive iOS SDK: 6.8.1 diff --git a/CHANGELOG.md b/CHANGELOG.md index f8c4a10..eb8b155 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ This document lets you know what has changed in the React Native module. For cha - [Android Changelog](https://github.com/apptentive/apptentive-kit-android/blob/master/CHANGELOG.md) - [iOS Changelog](https://github.com/apptentive/apptentive-kit-ios/blob/main/CHANGELOG.md) +# 2024-06-26 - v6.8.0 + +- Apptentive Android SDK: 6.8.0 +- Apptentive iOS SDK: 6.8.1 + # 2024-04-24 - v6.7.0 - Apptentive Android SDK: 6.7.0 diff --git a/android/build.gradle b/android/build.gradle index d45baca..d66d514 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -73,7 +73,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" // Apptentive - implementation 'com.apptentive:apptentive-kit-android:6.7.0' + implementation 'com.apptentive:apptentive-kit-android:6.8.0' } if (isNewArchitectureEnabled()) { diff --git a/android/src/main/java/com/apptentive/android/sdk/reactlibrary/ApptentiveModule.kt b/android/src/main/java/com/apptentive/android/sdk/reactlibrary/ApptentiveModule.kt index 6d2437b..6a3f113 100644 --- a/android/src/main/java/com/apptentive/android/sdk/reactlibrary/ApptentiveModule.kt +++ b/android/src/main/java/com/apptentive/android/sdk/reactlibrary/ApptentiveModule.kt @@ -356,10 +356,6 @@ class ApptentiveModule(private val reactContext: ReactApplicationContext) : return currentActivity } - override fun hasConstants(): Boolean { - return true - } - override fun getConstants(): MutableMap { return mutableMapOf("unreadMessageCountChangedEvent" to UNREAD_MESSAGE_COUNT_CHANGED) } diff --git a/apptentive-react-native.podspec b/apptentive-react-native.podspec index fb23ac1..9c35484 100644 --- a/apptentive-react-native.podspec +++ b/apptentive-react-native.podspec @@ -15,6 +15,6 @@ Pod::Spec.new do |s| s.source_files = "ios/**/*.{h,m,mm,swift}" - s.dependency 'ApptentiveKit', '~> 6.7.0' + s.dependency 'ApptentiveKit', '~> 6.8.1' s.dependency "React-Core" end diff --git a/package.json b/package.json index 18b3f18..6ff497e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "apptentive-react-native", - "version": "6.7.0", + "version": "6.8.0", "description": "React Native Module for Apptentive SDK", "main": "lib/commonjs/index", "module": "lib/module/index",