Skip to content

Commit

Permalink
Merge pull request #120 from apptentive/develop
Browse files Browse the repository at this point in the history
Release 6.8.0
  • Loading branch information
frankus authored Jun 26, 2024
2 parents bf2f92b + 5c86b33 commit 3e85dca
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/complete-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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, 'develop')
if: github.event.pull_request.merged == true && github.head_ref == 'develop'
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand Down
4 changes: 2 additions & 2 deletions .scripts/changes.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
- Apptentive Android SDK: 6.7.0
- Apptentive iOS SDK: 6.7.0
- Apptentive Android SDK: 6.8.0
- Apptentive iOS SDK: 6.8.1
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ This document lets you know what has changed in the Cordova plugin. For changes
- [Android Changelog](https://github.com/apptentive/apptentive-kit-android/blob/master/CHANGELOG.md)
- [iOS Changelog](https://github.com/apptentive/apptentive-kit-ios/blob/master/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
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "apptentive-cordova",
"version": "6.7.0",
"version": "6.8.0",
"description": "Apptentive Plugin For Cordova",
"cordova": {
"id": "apptentive-cordova",
Expand Down
6 changes: 3 additions & 3 deletions plugin.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="apptentive-cordova" version="6.7.0">
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="apptentive-cordova" version="6.8.0">

<name>Apptentive</name>
<description>Apptentive Plugin For Cordova</description>
Expand Down Expand Up @@ -54,7 +54,7 @@
<meta-data android:name="apptentive_rating_interaction_throttle_length" android:value="$ANDROID_RATING_INTERACTION_THROTTLE_LENGTH"/>
</config-file>

<framework src="com.apptentive:apptentive-kit-android:6.7.0"/>
<framework src="com.apptentive:apptentive-kit-android:6.8.0"/>
<source-file src="src/android/ApptentiveBridge.kt" target-dir="app/src/main/kotlin/com/apptentive/cordova"/>
<source-file src="src/android/JsonHelper.kt" target-dir="app/src/main/kotlin/com/apptentive/cordova"/>
<source-file src="src/android/Util.kt" target-dir="app/src/main/kotlin/com/apptentive/cordova"/>
Expand Down Expand Up @@ -112,7 +112,7 @@
<source url="https://github.com/CocoaPods/Specs.git"/>
</config>
<pods use-frameworks="true">
<pod name="ApptentiveKit" spec="~&gt; 6.7.0" swift-version="5"/>
<pod name="ApptentiveKit" spec="~&gt; 6.8.1" swift-version="5"/>
</pods>
</podspec>
</platform>
Expand Down
2 changes: 1 addition & 1 deletion www/Apptentive.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var Apptentive = {
distributionVersion: "6.7.0",
distributionVersion: "6.8.0",

addCustomDeviceData: function (successCallback, errorCallback, key, value) {
cordova.exec(successCallback, errorCallback, "ApptentiveBridge", "addCustomDeviceData", [key, value]);
Expand Down

0 comments on commit 3e85dca

Please sign in to comment.