Skip to content

Commit

Permalink
Release 7.0.1 (#216)
Browse files Browse the repository at this point in the history
* Cordova cleanup for Android SDK 9.0.2

* Release 7.0.1
  • Loading branch information
BrianBatchelder authored and rlepinski committed Mar 8, 2018
1 parent b6d8ba4 commit 5d60c28
Show file tree
Hide file tree
Showing 28 changed files with 30 additions and 13 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
=================================
Version 7.0.1 - March 8, 2018
=================================
- Updated iOS SDK to 9.0.3.
- Updated Android SDK to 9.0.2.
- Fixed build failures by excluding Android libraries version 28 until it is released.

=================================
Version 7.0.0 - February 14, 2018
Expand Down
2 changes: 0 additions & 2 deletions config_sample.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
<allow-intent href="geo:*" />
<platform name="android">
<allow-intent href="market:*" />
<!-- UA Android SDK requires minimum sdk version to be 16 -->
<preference name="android-minSdkVersion" value="16" />
</platform>
<platform name="ios">
<allow-intent href="itms:*" />
Expand Down
5 changes: 4 additions & 1 deletion create_sample.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash -ex
ROOT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )

cd "$(dirname "${BASH_SOURCE[0]}")"
ROOT_DIR="$(pwd)"
cd -

CORDOVA_PATH=$1

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": "urbanairship-cordova",
"version": "7.0.0",
"version": "7.0.1",
"description": "Urban Airship Cordova plugin",
"cordova": {
"id": "urbanairship-cordova",
Expand Down
4 changes: 2 additions & 2 deletions plugin.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<plugin id="urbanairship-cordova"
version="7.0.0"
version="7.0.1"
xmlns="http://www.phonegap.com/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android">

Expand Down Expand Up @@ -318,7 +318,7 @@
<resource-file src="src/ios/Airship/AirshipResources.bundle"/>

<!-- Airship library -->
<source-file framework="true" src="src/ios/Airship/libUAirship-9.0.2.a"/>
<source-file framework="true" src="src/ios/Airship/libUAirship-9.0.3.a"/>

<!-- System frameworks -->
<framework src="libsqlite3.dylib" />
Expand Down
14 changes: 7 additions & 7 deletions src/android/build-extras.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ repositories {
}

dependencies {
compile 'com.android.support:support-v4:[27.0.2,)'
compile 'com.android.support:support-annotations:[27.0.2,)'
compile 'com.google.android.gms:play-services-gcm:[11.8.0,)'
compile 'com.android.support:cardview-v7:[27.0.2,)'
compile 'com.google.android.gms:play-services-location:[11.8.0,)'
compile 'com.android.support:appcompat-v7:[27.0.2,)'
compile 'com.urbanairship.android:urbanairship-sdk:9.0.1'
compile 'com.android.support:support-v4:[27.0.2,28)'
compile 'com.android.support:support-annotations:[27.0.2,28)'
compile 'com.google.android.gms:play-services-gcm:[11.8.0,12)'
compile 'com.android.support:cardview-v7:[27.0.2,28)'
compile 'com.google.android.gms:play-services-location:[11.8.0,12)'
compile 'com.android.support:appcompat-v7:[27.0.2,28)'
compile 'com.urbanairship.android:urbanairship-sdk:9.0.2'
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified src/ios/Airship/AirshipResources.bundle/UAOverlayView.nib
Binary file not shown.
Binary file modified src/ios/Airship/AirshipResources.bundle/UARateAppPromptView.nib
Binary file not shown.
10 changes: 10 additions & 0 deletions src/ios/Airship/Headers/UAActionScheduleInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,16 @@ extern NSString *const UAActionScheduleInfoActionsKey;
*/
+ (instancetype)scheduleInfoWithBuilderBlock:(void(^)(UAActionScheduleInfoBuilder *builder))builderBlock;

/**
* Factory method to create an action schedule info from a JSON payload.
*
* @param json The JSON payload.
* @param error An NSError pointer for storing errors, if applicable.
* @return An action schedule info or `nil` if the JSON is invalid.
*/
+ (nullable instancetype)scheduleInfoWithJSON:(id)json error:(NSError * _Nullable *)error;


@end

NS_ASSUME_NONNULL_END
Expand Down
Binary file not shown.

0 comments on commit 5d60c28

Please sign in to comment.