diff --git a/.slather.yml b/.slather.yml index 135b20ca8..4be050905 100644 --- a/.slather.yml +++ b/.slather.yml @@ -1,4 +1,4 @@ coverage_service: coveralls xcodeproj: Snowplow.xcodeproj workspace: Snowplow.xcworkspace -scheme: Snowplow +scheme: Snowplow-iOS diff --git a/.travis.yml b/.travis.yml index 3771335bd..a8a8a366f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,50 @@ language: objective-c -osx_image: xcode10.2 +osx_image: xcode11 + +xcode_workspace: Snowplow.xcworkspace + +stages: + - lint + - test + - name: deploy + if: tag IS present + +jobs: + include: + - stage: lint + install: gem install cocoapods + script: pod lib lint --allow-warnings + + # FIXME: This test fails due to platform specific deps + # - <<: *test + # stage: test + # name: OSX / Xcode 11 + # xcode_scheme: Snowplow-macOS + # xcode_destination: platform=macOS + # before_script: + # - carthage update --platform macOS + # - pod install + + - &test + stage: test + name: iOS / Xcode 11 + xcode_scheme: Snowplow-iOS + xcode_destination: platform=iOS Simulator,OS=12.1,name=iPhone X + before_script: + - carthage update --platform iOS + - pod install + after_success: + - gem install slather + - slather + + - stage: deploy + script: pod trunk push --verbose + os: ios + osx_image: xcode11 + language: objective-c + on: + condition: $(< VERSION) == $TRAVIS_TAG + tags: true + env: - - TEST_PLATFORM="platform=iOS Simulator,OS=12.1,name=iPhone XR" -rvm: - - 2.3.7 -before_install: - - gem install slather - - gem install xcpretty -N --no-document -install: - - ./.travis/install.sh -script: ./.travis/test.sh -after_success: slather + secure: FfsA8B/GHFnIst46Z9Z2VNzd38NTsRp/DLF3IGDWTZAUFMRqVVu2fC/KmfOMH47XMqhtdvOkAjCf0K9BzDrpEwypAz4h5BoZPR7x+sz5eZ91jSKGAK7R8JWvj2hihoPSCc+ytXQwQFZYzP1hM6Wfyc+37riU7w00eJEz3vexD3w= diff --git a/Podfile b/Podfile index 6b1359793..f8a0fbb69 100644 --- a/Podfile +++ b/Podfile @@ -8,12 +8,12 @@ source 'https://github.com/CocoaPods/Specs.git' target 'Snowplow-iOS' do inherit! :search_paths platform :ios, '8.0' - pod 'FMDB', '2.6.2' - pod 'ReachabilitySwift' + pod 'FMDB' + pod 'Reachability' end target 'Snowplow-macOS' do - pod 'FMDB', '2.6.2' + pod 'FMDB' platform :osx, '10.9' end @@ -29,47 +29,3 @@ target 'Snowplow-macOSTests' do pod 'Nocilla' pod 'SnowplowIgluClient', :git => 'https://github.com/snowplow/iglu-objc-client.git', :branch => 'feature/carthage' end - -post_install do |installer| - handle_sqlite3 installer - installer.pods_project.targets.each do |target| - if ['ReachabilitySwift'].include? target.name - target.build_configurations.each do |config| - config.build_settings['SWIFT_VERSION'] = '4.2' - end - end - end -end - -def handle_sqlite3 installer - # We need to remove sqlite3 from the library - # For details see: https://github.com/CocoaPods/CocoaPods/issues/830 - default_library = installer.aggregate_targets.detect { |i| i.target_definition.name == 'Snowplow-iOS' } - [default_library.xcconfig_relative_path('Debug'), default_library.xcconfig_relative_path('Release')].each do |path| - path = File.expand_path(File.join(File.dirname(__FILE__), path)) - File.open("config.tmp", "w") do |io| - f = File.read(path) - f.gsub!(/-l"sqlite3"/, '') - io << f - end - FileUtils.mv("config.tmp", path) - end - - # We need to add sqlite3 into the test suite - default_library = installer.aggregate_targets.detect { |i| i.target_definition.name == 'Snowplow-iOSTests' } - [default_library.xcconfig_relative_path('Debug'), default_library.xcconfig_relative_path('Release')].each do |path| - path = File.expand_path(File.join(File.dirname(__FILE__), path)) - File.open("config.tmp", "w") do |io| - f = File.read(path) - f.gsub!(/(OTHER_LDFLAGS =)/, '\1 -l"sqlite3"') - io << f - end - FileUtils.mv("config.tmp", path) - end - - installer.pods_project.targets.each do |target| - target.build_configurations.each do |config| - config.build_settings['ONLY_ACTIVE_ARCH'] = 'NO' - end - end -end diff --git a/Podfile.lock b/Podfile.lock index a05912c41..2d4cba638 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -3,22 +3,22 @@ PODS: - FMDB/standard (= 2.6.2) - FMDB/standard (2.6.2) - Nocilla (0.11.0) - - ReachabilitySwift (4.3.0) + - Reachability (3.2) - SnowplowIgluClient (0.1.1): - VVJSONSchemaValidation (~> 1.5.0) - VVJSONSchemaValidation (1.5.0) DEPENDENCIES: - - FMDB (= 2.6.2) + - FMDB - Nocilla - - ReachabilitySwift + - Reachability - SnowplowIgluClient (from `https://github.com/snowplow/iglu-objc-client.git`, branch `feature/carthage`) SPEC REPOS: https://github.com/cocoapods/specs.git: - FMDB - Nocilla - - ReachabilitySwift + - Reachability - VVJSONSchemaValidation EXTERNAL SOURCES: @@ -34,10 +34,10 @@ CHECKOUT OPTIONS: SPEC CHECKSUMS: FMDB: 854a0341b4726e53276f2a8996f06f1b80f9259a Nocilla: 7af7a386071150cc8aa5da4da97d060f049dd61c - ReachabilitySwift: 408477d1b6ed9779dba301953171e017c31241f3 + Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96 SnowplowIgluClient: 4cda3cca105c844bea49b45e30145dc35cb5208d VVJSONSchemaValidation: 40411ea98f65d065a7c2ce7483876106bf710e9b -PODFILE CHECKSUM: 047bc905c385190179c8d68cd4481474c8e05932 +PODFILE CHECKSUM: a289f83e5e6da14c0e76638401b15d22ecb80fb0 -COCOAPODS: 1.5.3 +COCOAPODS: 1.7.3 diff --git a/Snowplow.xcodeproj/project.pbxproj b/Snowplow.xcodeproj/project.pbxproj index 9b0ff9328..d693c58be 100644 --- a/Snowplow.xcodeproj/project.pbxproj +++ b/Snowplow.xcodeproj/project.pbxproj @@ -3,10 +3,12 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 51; objects = { /* Begin PBXBuildFile section */ + 0DE5034C3ACB17AAFD161EB2 /* libPods-Snowplow-iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C01AF2D3FAC1A8D67935AE7F /* libPods-Snowplow-iOS.a */; }; + 35E8C9988A3B91BFCDAAFF93 /* libPods-Snowplow-macOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BA6E463BB92092EDED21E608 /* libPods-Snowplow-macOSTests.a */; }; 75264A30224E5DBC000E0E9B /* SPInstallTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 75264A2F224E5DBC000E0E9B /* SPInstallTracker.h */; settings = {ATTRIBUTES = (Private, ); }; }; 75264A32224E5DD2000E0E9B /* SPInstallTracker.m in Sources */ = {isa = PBXBuildFile; fileRef = 75264A31224E5DD2000E0E9B /* SPInstallTracker.m */; }; 752DABFE21CC3B380065F874 /* Snowplow_macOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 752DABF521CC3B380065F874 /* Snowplow_macOS.framework */; }; @@ -200,6 +202,8 @@ 75F9C5F021FA35BC00A5B8FC /* SPWeakTimerTarget.h in Headers */ = {isa = PBXBuildFile; fileRef = 044CA88B1B94791E000EA3B1 /* SPWeakTimerTarget.h */; settings = {ATTRIBUTES = (Private, ); }; }; 75F9C5F121FA35BC00A5B8FC /* SPEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 0402EBEB1BA93CA5006C8818 /* SPEvent.h */; settings = {ATTRIBUTES = (Public, ); }; }; 75F9C5F221FA35BC00A5B8FC /* SPRequestCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 049B2BDA1B7A203200BD82FC /* SPRequestCallback.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AAD44B3F00A188F43C1D4BD5 /* libPods-Snowplow-iOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BC36BC9B730FCFCC7D0236C /* libPods-Snowplow-iOSTests.a */; }; + B50992F407020D3A037C0388 /* libPods-Snowplow-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0029C16175D126436A482533 /* libPods-Snowplow-macOS.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -258,6 +262,8 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 0029C16175D126436A482533 /* libPods-Snowplow-macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Snowplow-macOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 01F6989679E1CF73B9009C61 /* Pods-Snowplow-macOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Snowplow-macOSTests.debug.xcconfig"; path = "Target Support Files/Pods-Snowplow-macOSTests/Pods-Snowplow-macOSTests.debug.xcconfig"; sourceTree = ""; }; 0402EBEB1BA93CA5006C8818 /* SPEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPEvent.h; sourceTree = ""; }; 0402EBED1BA93CCC006C8818 /* SPEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPEvent.m; sourceTree = ""; }; 04062D741B8390710019B8D1 /* SPSubject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPSubject.h; sourceTree = ""; }; @@ -272,6 +278,9 @@ 0485CA141BAC658500214BC5 /* SPSelfDescribingJson.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPSelfDescribingJson.h; sourceTree = ""; }; 0485CA151BAC65A300214BC5 /* SPSelfDescribingJson.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPSelfDescribingJson.m; sourceTree = ""; }; 049B2BDA1B7A203200BD82FC /* SPRequestCallback.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPRequestCallback.h; sourceTree = ""; }; + 359EDA5AB7D6476AE1A84B72 /* Pods-Snowplow-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Snowplow-iOS.release.xcconfig"; path = "Target Support Files/Pods-Snowplow-iOS/Pods-Snowplow-iOS.release.xcconfig"; sourceTree = ""; }; + 3BC36BC9B730FCFCC7D0236C /* libPods-Snowplow-iOSTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Snowplow-iOSTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 4B25D3005AC9A25C3E7651E0 /* Pods-Snowplow-macOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Snowplow-macOS.debug.xcconfig"; path = "Target Support Files/Pods-Snowplow-macOS/Pods-Snowplow-macOS.debug.xcconfig"; sourceTree = ""; }; 750E7F1121F2735C0050A993 /* Nocilla.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nocilla.framework; path = Carthage/Build/iOS/Nocilla.framework; sourceTree = ""; }; 75264A2F224E5DBC000E0E9B /* SPInstallTracker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPInstallTracker.h; sourceTree = ""; }; 75264A31224E5DD2000E0E9B /* SPInstallTracker.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SPInstallTracker.m; sourceTree = ""; }; @@ -331,6 +340,9 @@ 75D6061E21C9CA8A00C7B016 /* Snowplow-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Snowplow-Bridging-Header.h"; sourceTree = ""; }; 75D6061F21C9CA8B00C7B016 /* ReachabilityBridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReachabilityBridge.swift; sourceTree = ""; }; 75F9C5C821FA2E0F00A5B8FC /* libSnowplow-iOS-Static.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libSnowplow-iOS-Static.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 796556865B78D62503D8AB20 /* Pods-Snowplow-iOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Snowplow-iOSTests.release.xcconfig"; path = "Target Support Files/Pods-Snowplow-iOSTests/Pods-Snowplow-iOSTests.release.xcconfig"; sourceTree = ""; }; + 9CBFF11349089C13D1751C8D /* Pods-Snowplow-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Snowplow-iOS.debug.xcconfig"; path = "Target Support Files/Pods-Snowplow-iOS/Pods-Snowplow-iOS.debug.xcconfig"; sourceTree = ""; }; + A6D105758D09D93BD6255A6D /* Pods-Snowplow-macOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Snowplow-macOS.release.xcconfig"; path = "Target Support Files/Pods-Snowplow-macOS/Pods-Snowplow-macOS.release.xcconfig"; sourceTree = ""; }; AB0C27C0191B408200018557 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; AB0C27C4191B408200018557 /* Snowplow-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Snowplow-Prefix.pch"; sourceTree = ""; }; AB0C27C5191B408200018557 /* Snowplow.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Snowplow.h; sourceTree = ""; }; @@ -348,6 +360,10 @@ ABB767AF194974D3006275D1 /* SPEventStore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPEventStore.m; sourceTree = ""; }; ABFCC3741922984A00FAE8FE /* SPUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUtilities.h; sourceTree = ""; }; ABFCC3751922984A00FAE8FE /* SPUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUtilities.m; sourceTree = ""; }; + BA6E463BB92092EDED21E608 /* libPods-Snowplow-macOSTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Snowplow-macOSTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + C01AF2D3FAC1A8D67935AE7F /* libPods-Snowplow-iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Snowplow-iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + D7BBC9252D1ACAD190D529BD /* Pods-Snowplow-macOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Snowplow-macOSTests.release.xcconfig"; path = "Target Support Files/Pods-Snowplow-macOSTests/Pods-Snowplow-macOSTests.release.xcconfig"; sourceTree = ""; }; + E10CCD3B6D90D6C39D2AFC69 /* Pods-Snowplow-iOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Snowplow-iOSTests.debug.xcconfig"; path = "Target Support Files/Pods-Snowplow-iOSTests/Pods-Snowplow-iOSTests.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -359,6 +375,7 @@ 752DAC3F21CC4A7B0065F874 /* CoreTelephony.framework in Frameworks */, 752DAC0D21CC3EEA0065F874 /* FMDB.framework in Frameworks */, 752DAC0F21CC3EED0065F874 /* Reachability.framework in Frameworks */, + 0DE5034C3ACB17AAFD161EB2 /* libPods-Snowplow-iOS.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -373,6 +390,7 @@ 75CFDD1F22B814D800B0061C /* Nocilla.framework in Frameworks */, 75CFDD2022B814D800B0061C /* Reachability.framework in Frameworks */, 75CFDD2122B814D800B0061C /* FMDB.framework in Frameworks */, + AAD44B3F00A188F43C1D4BD5 /* libPods-Snowplow-iOSTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -393,6 +411,7 @@ 753DDA6D21F803B10007C3AE /* Cocoa.framework in Frameworks */, 75CAC45721F2A1E400271FB3 /* FMDB.framework in Frameworks */, 75CAC45621F2A1CC00271FB3 /* Foundation.framework in Frameworks */, + B50992F407020D3A037C0388 /* libPods-Snowplow-macOS.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -401,6 +420,7 @@ buildActionMask = 2147483647; files = ( 752DABFE21CC3B380065F874 /* Snowplow_macOS.framework in Frameworks */, + 35E8C9988A3B91BFCDAAFF93 /* libPods-Snowplow-macOSTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -418,6 +438,21 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 57E0E446A357280E91FB1A7E /* Pods */ = { + isa = PBXGroup; + children = ( + 9CBFF11349089C13D1751C8D /* Pods-Snowplow-iOS.debug.xcconfig */, + 359EDA5AB7D6476AE1A84B72 /* Pods-Snowplow-iOS.release.xcconfig */, + E10CCD3B6D90D6C39D2AFC69 /* Pods-Snowplow-iOSTests.debug.xcconfig */, + 796556865B78D62503D8AB20 /* Pods-Snowplow-iOSTests.release.xcconfig */, + 4B25D3005AC9A25C3E7651E0 /* Pods-Snowplow-macOS.debug.xcconfig */, + A6D105758D09D93BD6255A6D /* Pods-Snowplow-macOS.release.xcconfig */, + 01F6989679E1CF73B9009C61 /* Pods-Snowplow-macOSTests.debug.xcconfig */, + D7BBC9252D1ACAD190D529BD /* Pods-Snowplow-macOSTests.release.xcconfig */, + ); + path = Pods; + sourceTree = ""; + }; 752DABD821CC38560065F874 /* Snowplow iOSTests */ = { isa = PBXGroup; children = ( @@ -480,6 +515,7 @@ AB0C27C2191B408200018557 /* Snowplow */, AB0C27BF191B408200018557 /* Frameworks */, AB0C27BE191B408200018557 /* Products */, + 57E0E446A357280E91FB1A7E /* Pods */, ); sourceTree = ""; }; @@ -511,6 +547,10 @@ AB9E8213192DEC38006744C9 /* CoreTelephony.framework */, ABB67D8C192D9552009A1ECE /* UIKit.framework */, AB0C27C0191B408200018557 /* Foundation.framework */, + C01AF2D3FAC1A8D67935AE7F /* libPods-Snowplow-iOS.a */, + 3BC36BC9B730FCFCC7D0236C /* libPods-Snowplow-iOSTests.a */, + 0029C16175D126436A482533 /* libPods-Snowplow-macOS.a */, + BA6E463BB92092EDED21E608 /* libPods-Snowplow-macOSTests.a */, ); name = Frameworks; sourceTree = ""; @@ -691,6 +731,7 @@ isa = PBXNativeTarget; buildConfigurationList = 752DABDD21CC38560065F874 /* Build configuration list for PBXNativeTarget "Snowplow-iOS" */; buildPhases = ( + 176AC35AB9268EB8C4C85AE9 /* [CP] Check Pods Manifest.lock */, 752DABC721CC38550065F874 /* Headers */, 752DABC821CC38550065F874 /* Sources */, 752DABC921CC38550065F874 /* Frameworks */, @@ -709,10 +750,12 @@ isa = PBXNativeTarget; buildConfigurationList = 752DABE021CC38560065F874 /* Build configuration list for PBXNativeTarget "Snowplow-iOSTests" */; buildPhases = ( + 8B249689D5241C2628C0D467 /* [CP] Check Pods Manifest.lock */, 752DABD021CC38560065F874 /* Sources */, 752DABD121CC38560065F874 /* Frameworks */, 75CAC41C21F2960F00271FB3 /* CopyFiles */, 75CAC42921F29E5900271FB3 /* CopyFiles */, + E94D6CC29CF06B34014CE79E /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -746,6 +789,7 @@ isa = PBXNativeTarget; buildConfigurationList = 752DAC0621CC3B380065F874 /* Build configuration list for PBXNativeTarget "Snowplow-macOS" */; buildPhases = ( + DD9DDA9673187549844099A1 /* [CP] Check Pods Manifest.lock */, 752DABF021CC3B380065F874 /* Headers */, 752DABF121CC3B380065F874 /* Sources */, 752DABF221CC3B380065F874 /* Frameworks */, @@ -764,9 +808,11 @@ isa = PBXNativeTarget; buildConfigurationList = 752DAC0921CC3B380065F874 /* Build configuration list for PBXNativeTarget "Snowplow-macOSTests" */; buildPhases = ( + 1252B41D8B8F5C2C5E7B4F34 /* [CP] Check Pods Manifest.lock */, 752DABF921CC3B380065F874 /* Sources */, 752DABFA21CC3B380065F874 /* Frameworks */, 752DABFB21CC3B380065F874 /* Resources */, + 38DE9120B7A801433D83ABF4 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -880,6 +926,131 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + 1252B41D8B8F5C2C5E7B4F34 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Snowplow-macOSTests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + 176AC35AB9268EB8C4C85AE9 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Snowplow-iOS-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + 38DE9120B7A801433D83ABF4 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Snowplow-macOSTests/Pods-Snowplow-macOSTests-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Snowplow-macOSTests/Pods-Snowplow-macOSTests-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Snowplow-macOSTests/Pods-Snowplow-macOSTests-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + 8B249689D5241C2628C0D467 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Snowplow-iOSTests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + DD9DDA9673187549844099A1 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Snowplow-macOS-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + E94D6CC29CF06B34014CE79E /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Snowplow-iOSTests/Pods-Snowplow-iOSTests-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Snowplow-iOSTests/Pods-Snowplow-iOSTests-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Snowplow-iOSTests/Pods-Snowplow-iOSTests-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ 752DABC821CC38550065F874 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -1040,12 +1211,15 @@ /* Begin XCBuildConfiguration section */ 752DABDE21CC38560065F874 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 9CBFF11349089C13D1751C8D /* Pods-Snowplow-iOS.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_UNDEFINED_BEHAVIOR_SANITIZER_INTEGER = YES; + CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES; CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; @@ -1070,6 +1244,7 @@ "$(inherited)", "SNOWPLOW_APP_EXTENSIONS=0", ); + GCC_WARN_PEDANTIC = YES; INFOPLIST_FILE = "Snowplow iOS/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; @@ -1078,14 +1253,18 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + LIBRARY_SEARCH_PATHS = ""; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; + OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "com.snowplowanalytics.Snowplow-iOS"; PRODUCT_NAME = SnowplowTracker; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; + SWIFT_INSTALL_OBJC_HEADER = YES; SWIFT_OBJC_BRIDGING_HEADER = "Snowplow/Snowplow-Bridging-Header.h"; + SWIFT_PRECOMPILE_BRIDGING_HEADER = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; @@ -1095,12 +1274,15 @@ }; 752DABDF21CC38560065F874 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 359EDA5AB7D6476AE1A84B72 /* Pods-Snowplow-iOS.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_UNDEFINED_BEHAVIOR_SANITIZER_INTEGER = YES; + CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES; CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; @@ -1122,6 +1304,7 @@ GCC_C_LANGUAGE_STANDARD = gnu11; GCC_PREFIX_HEADER = "Snowplow/Snowplow-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = "SNOWPLOW_APP_EXTENSIONS=0"; + GCC_WARN_PEDANTIC = YES; INFOPLIST_FILE = "Snowplow iOS/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; @@ -1130,14 +1313,18 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + LIBRARY_SEARCH_PATHS = ""; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; + OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "com.snowplowanalytics.Snowplow-iOS"; PRODUCT_NAME = SnowplowTracker; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; + SWIFT_INSTALL_OBJC_HEADER = YES; SWIFT_OBJC_BRIDGING_HEADER = "Snowplow/Snowplow-Bridging-Header.h"; + SWIFT_PRECOMPILE_BRIDGING_HEADER = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; @@ -1147,6 +1334,7 @@ }; 752DABE121CC38560065F874 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = E10CCD3B6D90D6C39D2AFC69 /* Pods-Snowplow-iOSTests.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ANALYZER_NONNULL = YES; @@ -1199,6 +1387,7 @@ }; 752DABE221CC38560065F874 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 796556865B78D62503D8AB20 /* Pods-Snowplow-iOSTests.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ANALYZER_NONNULL = YES; @@ -1359,6 +1548,7 @@ }; 752DAC0721CC3B380065F874 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 4B25D3005AC9A25C3E7651E0 /* Pods-Snowplow-macOS.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CLANG_ANALYZER_NONNULL = YES; @@ -1379,6 +1569,10 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + EXCLUDED_SOURCE_FILE_NAMES = ( + "Snowplow/UIViewController+SPScreenView_SWIZZLE.m", + "Snowplow/UIViewController+SPScreenView_SWIZZLE.h", + ); FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/Mac", @@ -1397,10 +1591,12 @@ "@executable_path/../Frameworks", "@loader_path/Frameworks", ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; MACOSX_DEPLOYMENT_TARGET = 10.9; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; + OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "com.snowplowanalytics.Snowplow-macOS"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1413,6 +1609,7 @@ }; 752DAC0821CC3B380065F874 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = A6D105758D09D93BD6255A6D /* Pods-Snowplow-macOS.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CLANG_ANALYZER_NONNULL = YES; @@ -1434,6 +1631,10 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + EXCLUDED_SOURCE_FILE_NAMES = ( + "Snowplow/UIViewController+SPScreenView_SWIZZLE.m", + "Snowplow/UIViewController+SPScreenView_SWIZZLE.h", + ); FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/Mac", @@ -1448,10 +1649,12 @@ "@executable_path/../Frameworks", "@loader_path/Frameworks", ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; MACOSX_DEPLOYMENT_TARGET = 10.9; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; + OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "com.snowplowanalytics.Snowplow-macOS"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1464,6 +1667,7 @@ }; 752DAC0A21CC3B380065F874 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 01F6989679E1CF73B9009C61 /* Pods-Snowplow-macOSTests.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ANALYZER_NONNULL = YES; @@ -1499,6 +1703,7 @@ }; 752DAC0B21CC3B380065F874 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = D7BBC9252D1ACAD190D529BD /* Pods-Snowplow-macOSTests.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CLANG_ANALYZER_NONNULL = YES; diff --git a/Snowplow.xcworkspace/contents.xcworkspacedata b/Snowplow.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..55e1a4692 --- /dev/null +++ b/Snowplow.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/SnowplowTracker.podspec b/SnowplowTracker.podspec index 074186177..f2fbe8cea 100644 --- a/SnowplowTracker.podspec +++ b/SnowplowTracker.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "SnowplowTracker" - s.version = "1.1.2" + s.version = "1.1.3-rc1" s.summary = "Snowplow event tracker for iOS 7+. Add analytics to your iOS apps and games." s.description = <<-DESC Snowplow is a mobile and event analytics platform with a difference: rather than tell our users how they should analyze their data, we deliver their event-level data in their own data warehouse, on their own Amazon Redshift or Postgres database, so they can analyze it any way they choose. Snowplow mobile is used by data-savvy games companies and app developers to better understand their users and how they engage with their games and applications. Snowplow is open source using the business-friendly Apache License, Version 2.0 and scales horizontally to many billions of events. diff --git a/VERSION b/VERSION index 45a1b3f44..88e7590e7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.2 +1.1.3-rc1