Skip to content

Commit

Permalink
Merge pull request #963 from urbanairship/MB-1591
Browse files Browse the repository at this point in the history
[MB-1591] Release 7.0.0
  • Loading branch information
rlepinski committed Jan 29, 2016
2 parents bd5ca3a + fd82bd0 commit 45c2b5c
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 16 deletions.
8 changes: 4 additions & 4 deletions AirshipKit/AirshipKit.xcodeproj/project.pbxproj
Expand Up @@ -13,7 +13,7 @@
494DD95D1B0EB677009C134E /* AirshipKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 494DD95C1B0EB677009C134E /* AirshipKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
494DDC261B0FD6A1009C134E /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 494DDC251B0FD6A1009C134E /* libsqlite3.dylib */; };
494DDC281B0FD6A6009C134E /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 494DDC271B0FD6A6009C134E /* libz.dylib */; };
49D5281D1B17DFE7006E35FB /* libUAirship-6.4.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49D5281C1B17DFE7006E35FB /* libUAirship-6.4.0.a */; };
49D5281D1B17DFE7006E35FB /* libUAirship-7.0.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49D5281C1B17DFE7006E35FB /* libUAirship-7.0.0.a */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -25,7 +25,7 @@
494DD95C1B0EB677009C134E /* AirshipKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AirshipKit.h; sourceTree = "<group>"; };
494DDC251B0FD6A1009C134E /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
494DDC271B0FD6A6009C134E /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
49D5281C1B17DFE7006E35FB /* libUAirship-6.4.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libUAirship-6.4.0.a"; path = "../Airship/libUAirship-6.4.0.a"; sourceTree = "<group>"; };
49D5281C1B17DFE7006E35FB /* libUAirship-7.0.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libUAirship-7.0.0.a"; path = "../Airship/libUAirship-7.0.0.a"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -35,7 +35,7 @@
files = (
494DDC281B0FD6A6009C134E /* libz.dylib in Frameworks */,
494DDC261B0FD6A1009C134E /* libsqlite3.dylib in Frameworks */,
49D5281D1B17DFE7006E35FB /* libUAirship-6.4.0.a in Frameworks */,
49D5281D1B17DFE7006E35FB /* libUAirship-7.0.0.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -46,7 +46,7 @@
isa = PBXGroup;
children = (
492051421C0D176400A7B36D /* AirshipResources.bundle */,
49D5281C1B17DFE7006E35FB /* libUAirship-6.4.0.a */,
49D5281C1B17DFE7006E35FB /* libUAirship-7.0.0.a */,
494DDC271B0FD6A6009C134E /* libz.dylib */,
494DDC251B0FD6A1009C134E /* libsqlite3.dylib */,
494DD9591B0EB677009C134E /* AirshipKit */,
Expand Down
10 changes: 5 additions & 5 deletions AirshipLib/AirshipLib.xcodeproj/project.pbxproj
Expand Up @@ -7,7 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
1F4230C016C09876004B52C1 /* libUAirship-6.4.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BB88612C159A7E9600584445 /* libUAirship-6.4.0.a */; };
1F4230C016C09876004B52C1 /* libUAirship-7.0.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BB88612C159A7E9600584445 /* libUAirship-7.0.0.a */; };
1F4EDB3C1831839A00F77343 /* UAAction+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 4995C62217FA3D71004F8724 /* UAAction+Internal.h */; };
1F55FB6D181A34DD002AA192 /* UABeveledLoadingIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F55FB6B181A34DD002AA192 /* UABeveledLoadingIndicator.h */; };
1F55FB6F181A34DD002AA192 /* UABeveledLoadingIndicator.m in Sources */ = {isa = PBXBuildFile; fileRef = 1F55FB6C181A34DD002AA192 /* UABeveledLoadingIndicator.m */; };
Expand Down Expand Up @@ -667,7 +667,7 @@
BB42FB7D150969F200FC4B1B /* UALocationCommonValues.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UALocationCommonValues.m; sourceTree = "<group>"; };
BB484B2915910C370097B38C /* UALocationTestUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UALocationTestUtils.h; path = ../../TestCommon/LocationTest/UALocationTestUtils.h; sourceTree = "<group>"; };
BB484B2A15910C370097B38C /* UALocationTestUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UALocationTestUtils.m; path = ../../TestCommon/LocationTest/UALocationTestUtils.m; sourceTree = "<group>"; };
BB88612C159A7E9600584445 /* libUAirship-6.4.0.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libUAirship-6.4.0.a"; sourceTree = BUILT_PRODUCTS_DIR; };
BB88612C159A7E9600584445 /* libUAirship-7.0.0.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libUAirship-7.0.0.a"; sourceTree = BUILT_PRODUCTS_DIR; };
BB926B3C1540D1D000003975 /* UAAnalytics+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UAAnalytics+Internal.h"; sourceTree = "<group>"; };
BBB87D56150574DE00971CEC /* CLLocationManager+Test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CLLocationManager+Test.h"; sourceTree = "<group>"; };
BBB87D57150574DE00971CEC /* CLLocationManager+Test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CLLocationManager+Test.m"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -850,7 +850,7 @@
49C6721E1857CE840088F210 /* JavaScriptCore.framework in Frameworks */,
760D14BA17C2C9E600BBE6E6 /* XCTest.framework in Frameworks */,
CC523FC317BA8AC200233005 /* CoreData.framework in Frameworks */,
1F4230C016C09876004B52C1 /* libUAirship-6.4.0.a in Frameworks */,
1F4230C016C09876004B52C1 /* libUAirship-7.0.0.a in Frameworks */,
BBB87E5115057EEA00971CEC /* libOCMock.a in Frameworks */,
BBB87E4F15057EC400971CEC /* CoreLocation.framework in Frameworks */,
7B909D431429363300D0AB36 /* Security.framework in Frameworks */,
Expand Down Expand Up @@ -881,7 +881,7 @@
isa = PBXGroup;
children = (
7BB679061429288D00B877DB /* AirshipLogicTests.xctest */,
BB88612C159A7E9600584445 /* libUAirship-6.4.0.a */,
BB88612C159A7E9600584445 /* libUAirship-7.0.0.a */,
4920512C1C0D0C0A00A7B36D /* AirshipResources.bundle */,
);
name = Products;
Expand Down Expand Up @@ -1908,7 +1908,7 @@
);
name = AirshipLib;
productName = AirshipLib;
productReference = BB88612C159A7E9600584445 /* libUAirship-6.4.0.a */;
productReference = BB88612C159A7E9600584445 /* libUAirship-7.0.0.a */;
productType = "com.apple.product-type.library.static";
};
/* End PBXNativeTarget section */
Expand Down
Expand Up @@ -15,18 +15,18 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BB8860A7159A7E9600584445"
BuildableName = "libUAirship-6.4.0.a"
BuildableName = "libUAirship-7.0.0.a"
BlueprintName = "AirshipLib"
ReferencedContainer = "container:AirshipLib.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -49,21 +49,24 @@
</BuildableReference>
</TestableReference>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BB8860A7159A7E9600584445"
BuildableName = "libUAirship-6.4.0.a"
BuildableName = "libUAirship-7.0.0.a"
BlueprintName = "AirshipLib"
ReferencedContainer = "container:AirshipLib.xcodeproj">
</BuildableReference>
Expand All @@ -72,10 +75,10 @@
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
Expand Down
2 changes: 1 addition & 1 deletion AirshipLib/Config.xcconfig
Expand Up @@ -22,7 +22,7 @@
// OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
CURRENT_PROJECT_VERSION = 6.4.0
CURRENT_PROJECT_VERSION = 7.0.0

RELEASE_OTHER_CFLAGS = -fembed-bitcode

Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG
Expand Up @@ -3,6 +3,20 @@ iOS Changelog

Migration Guide: http://docs.urbanairship.com/topic_guides/ios_migration.html.

Version 7.0.0 - January 28, 2016
================================
- Includes support for out of the box Message Center. The Message Center can be themed to match the application
or it can be overridden with a custom Message Center implementation.
- Landing pages will no longer show error pages, instead they will retry indefinitely every 20 seconds
until either the page loads successfully or the user exits the page.
- Packaged SDK resources in Airship resources bundle.
- Removed out dated Sample UI classes.
- New unified sample that replaces the previous inbox and push sample. The sample is available in
both Swift and Objective-C.
- detectProvisionMode now defaults to YES if neither detectProvisionMode and
inProduction are explicitly set.
- Fixed detectProvisionMode incorrectly detecting the app running on a simulator.

6.4.0 - October 29, 2015
========================
- Added a flag to disable sending the device token with channel registration.
Expand Down

0 comments on commit 45c2b5c

Please sign in to comment.