diff --git a/CHANGELOG.md b/CHANGELOG.md index cc455c7..0f6c1ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ Change Log ========== +Version 1.0.4 *(August, 2016)* +------------------------------------------- +*(Supports analytics-ios 3.+ and Appboy 2.21.0+)* + +- Updates the wrapper SDK to work with the Cocoapod 1.0.x. + Version 1.0.3 *(June, 2016)* ------------------------------------------- *(Supports analytics-ios 3.+ and Appboy 2.20.1+)* diff --git a/Example/Segment-Appboy.xcodeproj/project.pbxproj b/Example/Segment-Appboy.xcodeproj/project.pbxproj index 2161a26..13a5ffe 100644 --- a/Example/Segment-Appboy.xcodeproj/project.pbxproj +++ b/Example/Segment-Appboy.xcodeproj/project.pbxproj @@ -199,12 +199,12 @@ isa = PBXNativeTarget; buildConfigurationList = 6003F5BF195388D20070C39A /* Build configuration list for PBXNativeTarget "Segment-Appboy_Example" */; buildPhases = ( - 435E4717A088B9549A0B43C6 /* Check Pods Manifest.lock */, + 435E4717A088B9549A0B43C6 /* [CP] Check Pods Manifest.lock */, 6003F586195388D20070C39A /* Sources */, 6003F587195388D20070C39A /* Frameworks */, 6003F588195388D20070C39A /* Resources */, - D3665A2A329991C788AD855F /* Embed Pods Frameworks */, - B7D8B7B344BC559F45D51EE6 /* Copy Pods Resources */, + D3665A2A329991C788AD855F /* [CP] Embed Pods Frameworks */, + B7D8B7B344BC559F45D51EE6 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -219,12 +219,12 @@ isa = PBXNativeTarget; buildConfigurationList = 6003F5C2195388D20070C39A /* Build configuration list for PBXNativeTarget "Segment-Appboy_Tests" */; buildPhases = ( - E802DAF3E4C6D80BE10A2B25 /* Check Pods Manifest.lock */, + E802DAF3E4C6D80BE10A2B25 /* [CP] Check Pods Manifest.lock */, 6003F5AA195388D20070C39A /* Sources */, 6003F5AB195388D20070C39A /* Frameworks */, 6003F5AC195388D20070C39A /* Resources */, - 8C97F5D383595BA7C234BB82 /* Embed Pods Frameworks */, - B7FF83C7C1E793F4BF195D61 /* Copy Pods Resources */, + 8C97F5D383595BA7C234BB82 /* [CP] Embed Pods Frameworks */, + B7FF83C7C1E793F4BF195D61 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -301,14 +301,14 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 435E4717A088B9549A0B43C6 /* Check Pods Manifest.lock */ = { + 435E4717A088B9549A0B43C6 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -316,14 +316,14 @@ shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; - 8C97F5D383595BA7C234BB82 /* Embed Pods Frameworks */ = { + 8C97F5D383595BA7C234BB82 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Embed Pods Frameworks"; + name = "[CP] Embed Pods Frameworks"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -331,14 +331,14 @@ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Segment-Appboy_Tests/Pods-Segment-Appboy_Tests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - B7D8B7B344BC559F45D51EE6 /* Copy Pods Resources */ = { + B7D8B7B344BC559F45D51EE6 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -346,14 +346,14 @@ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Segment-Appboy_Example/Pods-Segment-Appboy_Example-resources.sh\"\n"; showEnvVarsInLog = 0; }; - B7FF83C7C1E793F4BF195D61 /* Copy Pods Resources */ = { + B7FF83C7C1E793F4BF195D61 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -361,14 +361,14 @@ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Segment-Appboy_Tests/Pods-Segment-Appboy_Tests-resources.sh\"\n"; showEnvVarsInLog = 0; }; - D3665A2A329991C788AD855F /* Embed Pods Frameworks */ = { + D3665A2A329991C788AD855F /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Embed Pods Frameworks"; + name = "[CP] Embed Pods Frameworks"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -376,14 +376,14 @@ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Segment-Appboy_Example/Pods-Segment-Appboy_Example-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - E802DAF3E4C6D80BE10A2B25 /* Check Pods Manifest.lock */ = { + E802DAF3E4C6D80BE10A2B25 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; diff --git a/LICENSE b/LICENSE index bb13b60..d27e2fb 100644 --- a/LICENSE +++ b/LICENSE @@ -1,9 +1,21 @@ -Copyright (c) 2016 Appboy, Inc. -All rights reserved. +The MIT License (MIT) -* Use of source code or binaries contained within Appboy's Segment iOS SDK is permitted only to enable use of the Appboy platform by customers of Appboy. -* Modification of source code and inclusion in mobile apps is explicitly allowed provided that all other conditions are met. -* Neither the name of Appboy nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. -* Redistribution of source code or binaries is disallowed except with specific prior written permission. Any such redistribution must retain the above copyright notice, this list of conditions and the following disclaimer. +Copyright (c) 2016 Segment.io, Inc. -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 THE COPYRIGHT HOLDER OR CONTRIBUTORS 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. \ No newline at end of file +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/Pod/Classes/SEGAppboyIntegration.m b/Pod/Classes/SEGAppboyIntegration.m index ef524ba..0a831ef 100644 --- a/Pod/Classes/SEGAppboyIntegration.m +++ b/Pod/Classes/SEGAppboyIntegration.m @@ -1,6 +1,6 @@ #import "SEGAppboyIntegration.h" -#import "Appboy-iOS-SDK/AppboyKit.h" -#import "Appboy-iOS-SDK/ABKUser.h" +#import +#import #import #import "SEGAppboyIntegrationFactory.h" diff --git a/RELEASING.md b/RELEASING.md index d3d6db6..5cde93a 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -1,7 +1,7 @@ Releasing ========= - 1. Update the version in `Segment-Appboy.podspec` to a non-beta version. + 1. Update the version in `Segment-Appboy.podspec`. 2. Update the `CHANGELOG.md` for the impending release. 3. `git commit -am "Prepare for release X.Y.Z."` (where X.Y.Z is the new version) 4. `git tag -a X.Y.Z -m "Version X.Y.Z"` (where X.Y.Z is the new version) diff --git a/Segment-Appboy.podspec b/Segment-Appboy.podspec index 965e834..71fa435 100644 --- a/Segment-Appboy.podspec +++ b/Segment-Appboy.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Segment-Appboy" - s.version = "1.0.3" + s.version = "1.0.4" s.summary = "Appboy Integration for Segment's analytics-ios library." s.description = <<-DESC