Skip to content

Commit

Permalink
Merge pull request #49 from apptentive/develop
Browse files Browse the repository at this point in the history
Release 5.1.0
  • Loading branch information
frankus authored May 14, 2018
2 parents 089674c + 9c27721 commit 6a86ac7
Show file tree
Hide file tree
Showing 40 changed files with 333 additions and 1,357 deletions.
17 changes: 13 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
# Created by .ignore support plugin (hsz.mobi)
*.iws
# Mac
.DS_Store

.idea/
# Node
npm-debug.log
/node_modules

node_modules
# Cordova
/platforms
/plugins

# Idea
/.idea

# res
resources/signing
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-android/blob/master/CHANGELOG.md)
- [iOS Changelog](https://github.com/apptentive/apptentive-ios/blob/master/CHANGELOG.md)

# 2018-05-14 - v5.1.0

- Apptentive Android SDK: 5.1.1
- Apptentive iOS SDK: 5.1.0

# 2018-01-18 - v5.0.0

- Apptentive Android SDK: 5.0.2
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": "5.0.0",
"version": "5.1.0",
"description": "Apptentive Plugin For Cordova",
"cordova": {
"id": "com.apptentive.cordova",
Expand Down
11 changes: 5 additions & 6 deletions plugin.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?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="com.apptentive.cordova" version="5.0.0">
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="com.apptentive.cordova" version="5.1.0">

<name>ApptentiveBridge</name>
<name>Apptentive</name>
<description>Apptentive Plugin For Cordova</description>
<keywords>apptentive</keywords>
<engines>
Expand All @@ -10,7 +10,6 @@

<!-- android -->
<platform name="android">

<!-- Require API key -->
<preference name="ANDROID_APP_KEY"/>
<preference name="ANDROID_APP_SIGNATURE"/>
Expand Down Expand Up @@ -41,9 +40,9 @@
</config-file>
<config-file target="./res/values/strings.xml" parent="/resources">
<string name="apptentive_distribution">Cordova</string>
<string name="apptentive_distribution_version">5.0.0</string>
<string name="apptentive_distribution_version">5.1.0</string>
</config-file>
<framework src="com.apptentive:apptentive-android:5.0.2"/>
<framework src="com.apptentive:apptentive-android:5.1.1"/>
<source-file src="src/android/ApptentiveBridge.java" target-dir="src/com/apptentive/cordova"/>
<source-file src="src/android/JsonHelper.java" target-dir="src/com/apptentive/cordova"/>
</platform>
Expand Down Expand Up @@ -74,7 +73,7 @@
</config-file>

<config-file target="*-Info.plist" parent="ApptentivePluginVersion">
<string>5.0.0</string>
<string>5.1.0</string>
</config-file>

<!-- ApptentiveBridge -->
Expand Down
Loading

0 comments on commit 6a86ac7

Please sign in to comment.