Skip to content

Commit

Permalink
Merge pull request #26 from apptentive/develop
Browse files Browse the repository at this point in the history
Release 5.1.1
  • Loading branch information
frankus authored Jul 24, 2018
2 parents 74a0a58 + f0f9d6e commit e6c7da7
Show file tree
Hide file tree
Showing 9 changed files with 58 additions and 9 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ This document lets you know what has changed in the React Native module. For cha
- [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-07-24 - v5.1.1

- Add podspec for projects integrating React via (deprecated) CocoaPod
- Apptentive Android SDK: 5.1.5
- Apptentive iOS SDK: 5.1.2

# 2018-05-14 - v5.1.0

- Apptentive Android SDK: 5.1.0
Expand Down
24 changes: 24 additions & 0 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
Copyright (c) 2011-2014, Apptentive, Inc.
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the Apptentive, Inc. nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL Apptentive, Inc. BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ repositories {

dependencies {
compile 'com.facebook.react:react-native:+'
compile 'com.apptentive:apptentive-android:5.1.1'
compile 'com.apptentive:apptentive-android:5.1.5'
}

2 changes: 1 addition & 1 deletion android/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="apptentive_distribution">React Native</string>
<string name="apptentive_distribution_version">5.1.0</string>
<string name="apptentive_distribution_version">5.1.1</string>
</resources>
19 changes: 19 additions & 0 deletions apptentive-react-native.podspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Pod::Spec.new do |s|
s.name = "apptentive-react-native"
s.version = "5.1.1"
s.summary = "Apptentive SDK module for React Native"

s.description = <<-DESC
React Native module for the Apptentive iOS SDK.
DESC

s.homepage = "https://github.com/apptentive/apptentive-react-native"
s.license = "BSD"
s.author = { "Apptentive, Inc." => "info@apptentive.com" }
s.platform = :ios
s.platform = :ios, "9.0"
s.source = { :git => "https://github.com/apptentive/apptentive-react-native.git", :tag => "v#{s.version}" }
s.source_files = "ios/*.{h,m}"
s.public_header_files = "ios/*.h"
s.dependency "React"
end
2 changes: 1 addition & 1 deletion ios/RNApptentiveModule.m
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ - (dispatch_queue_t)methodQueue
if (configuration) {
configuration.appID = configurationDictionary[@"appleID"];
configuration.distributionName = @"React Native";
configuration.distributionVersion = @"5.1.0";
configuration.distributionVersion = @"5.1.1";
[Apptentive registerWithConfiguration:configuration];

[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(messageCenterUnreadCountChangedNotification:) name:ApptentiveMessageCenterUnreadCountChangedNotification object:nil];
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-react-native",
"version": "5.1.0",
"version": "5.1.1",
"description": "React Native Module for Apptentive SDK",
"main": "js/index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion sample/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ target 'sample' do
use_frameworks!

# Pods for sample
pod 'apptentive-ios', '5.1.0'
pod 'apptentive-ios', '5.1.2'

target 'sampleTests' do
inherit! :search_paths
Expand Down
8 changes: 4 additions & 4 deletions sample/ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
PODS:
- apptentive-ios (5.1.0)
- apptentive-ios (5.1.2)

DEPENDENCIES:
- apptentive-ios (= 5.1.0)
- apptentive-ios (= 5.1.2)

SPEC CHECKSUMS:
apptentive-ios: 8076dff6e16b3f223fea858663806ac2bc63d004
apptentive-ios: b8f7f93cdec61e834f18f733fbb742094369445f

PODFILE CHECKSUM: 3b881b3c9fae5fa80174617896eaa194c8b580ac
PODFILE CHECKSUM: 027aa9c1233cd24527d576c0cafa829c237843c0

COCOAPODS: 1.4.0

0 comments on commit e6c7da7

Please sign in to comment.