From 6a214e8baf6900de62fc9ba59ce52d3ce660c22c Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Mon, 10 Jun 2024 10:07:28 +0300 Subject: [PATCH 01/34] start change --- .github/bash_scripts/pre_release.sh | 1 + .github/workflows/prepare-for-QA-release.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/bash_scripts/pre_release.sh b/.github/bash_scripts/pre_release.sh index 8d9281b..b512598 100644 --- a/.github/bash_scripts/pre_release.sh +++ b/.github/bash_scripts/pre_release.sh @@ -3,6 +3,7 @@ appsflyerLibVersion=$1 sed -i '' "s/version_appsflyerLib = \'.*\'/version_appsflyerLib = \'$appsflyerLibVersion\'/g" segment-appsflyer-ios.podspec +sed -i '' "s/s.name = \"segment-appsflyer-ios\"/s.name = \"segment-appsflyer-ios-qa\"/g" segment-appsflyer-ios.podspec sed -r -i '' "s/(.*AppsFlyerLib.*)([0-9]+\.[0-9]+\.[0-9]+)(.*)/\1$appsflyerLibVersion\3/g" Package.swift diff --git a/.github/workflows/prepare-for-QA-release.yml b/.github/workflows/prepare-for-QA-release.yml index 1e8b617..2b0644e 100644 --- a/.github/workflows/prepare-for-QA-release.yml +++ b/.github/workflows/prepare-for-QA-release.yml @@ -12,6 +12,7 @@ jobs: uses: actions/checkout@v3 - name: Determine release tag and release branch run: | + echo ${{github.ref_name}} TAG=$(echo "${{github.ref_name}}" | grep -Eo '[0-9]+.[0-9]+.[0-9]+') echo "PLUGIN_VERSION=$TAG" >> $GITHUB_ENV - name: run script From b4c99fb226c80e7e00c4229dc5210b6cfb54f52a Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Mon, 10 Jun 2024 10:17:46 +0300 Subject: [PATCH 02/34] add to podspec qa modifications --- .github/bash_scripts/pre_release.sh | 2 ++ .github/workflows/prepare-for-QA-release.yml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/bash_scripts/pre_release.sh b/.github/bash_scripts/pre_release.sh index b512598..47e43ff 100644 --- a/.github/bash_scripts/pre_release.sh +++ b/.github/bash_scripts/pre_release.sh @@ -1,8 +1,10 @@ #!/bin/bash appsflyerLibVersion=$1 +rcVersion=$2 sed -i '' "s/version_appsflyerLib = \'.*\'/version_appsflyerLib = \'$appsflyerLibVersion\'/g" segment-appsflyer-ios.podspec +sed -i '' "s/version_plugin = \'.*\'/version_plugin = \'$rcVersion\'/g" segment-appsflyer-ios.podspec sed -i '' "s/s.name = \"segment-appsflyer-ios\"/s.name = \"segment-appsflyer-ios-qa\"/g" segment-appsflyer-ios.podspec sed -r -i '' "s/(.*AppsFlyerLib.*)([0-9]+\.[0-9]+\.[0-9]+)(.*)/\1$appsflyerLibVersion\3/g" Package.swift diff --git a/.github/workflows/prepare-for-QA-release.yml b/.github/workflows/prepare-for-QA-release.yml index 2b0644e..502841d 100644 --- a/.github/workflows/prepare-for-QA-release.yml +++ b/.github/workflows/prepare-for-QA-release.yml @@ -16,7 +16,7 @@ jobs: TAG=$(echo "${{github.ref_name}}" | grep -Eo '[0-9]+.[0-9]+.[0-9]+') echo "PLUGIN_VERSION=$TAG" >> $GITHUB_ENV - name: run script - run: bash .github/bash_scripts/pre_release.sh ${{env.PLUGIN_VERSION}} + run: bash .github/bash_scripts/pre_release.sh ${{env.PLUGIN_VERSION}} ${{github.ref_name}} - name: Commit changes uses: EndBug/add-and-commit@v9 with: From a51d3b72cf494c67b9aca4b1f972d61623ff6c45 Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Mon, 10 Jun 2024 10:35:35 +0300 Subject: [PATCH 03/34] add tag --- .github/workflows/prepare-for-QA-release.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/prepare-for-QA-release.yml b/.github/workflows/prepare-for-QA-release.yml index 502841d..8ec238a 100644 --- a/.github/workflows/prepare-for-QA-release.yml +++ b/.github/workflows/prepare-for-QA-release.yml @@ -14,14 +14,20 @@ jobs: run: | echo ${{github.ref_name}} TAG=$(echo "${{github.ref_name}}" | grep -Eo '[0-9]+.[0-9]+.[0-9]+') - echo "PLUGIN_VERSION=$TAG" >> $GITHUB_ENV + echo "PLUGIN_VERSION=$TAG" >> $GITHUB_ENV + TAG_RC=$(echo "${{github.ref_name}}" | grep -Eo '[0-9]+.[0-9]+.[0-9]+-rc[0-9]+') + echo "PLUGIN_VERSION_RC=$TAG_RC" >> $GITHUB_ENV + - name: run script - run: bash .github/bash_scripts/pre_release.sh ${{env.PLUGIN_VERSION}} ${{github.ref_name}} + run: bash .github/bash_scripts/pre_release.sh ${{env.PLUGIN_VERSION}} ${{env.PLUGIN_VERSION_RC}} - name: Commit changes uses: EndBug/add-and-commit@v9 with: author_name: Moris Gateno author_email: moris.gateno@appsflyer.com message: 'Commited from github action - prepaing the repo for QA locally.' - add: '.' + add: '.' + tag: "${{env.PLUGIN_VERSION_RC}} --force" + tag_push: '--force' + From 4e9586d108412a656732fd891a51fed3c79d32ca Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Mon, 10 Jun 2024 11:22:00 +0300 Subject: [PATCH 04/34] add change yo workflows --- .github/bash_scripts/pre_release.sh | 1 + .github/workflows/release-QA-workflow.yml | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/bash_scripts/pre_release.sh b/.github/bash_scripts/pre_release.sh index 47e43ff..a482bb1 100644 --- a/.github/bash_scripts/pre_release.sh +++ b/.github/bash_scripts/pre_release.sh @@ -6,6 +6,7 @@ rcVersion=$2 sed -i '' "s/version_appsflyerLib = \'.*\'/version_appsflyerLib = \'$appsflyerLibVersion\'/g" segment-appsflyer-ios.podspec sed -i '' "s/version_plugin = \'.*\'/version_plugin = \'$rcVersion\'/g" segment-appsflyer-ios.podspec sed -i '' "s/s.name = \"segment-appsflyer-ios\"/s.name = \"segment-appsflyer-ios-qa\"/g" segment-appsflyer-ios.podspec +mv segment-appsflyer-ios.podspec segment-appsflyer-ios-qa.podspec sed -r -i '' "s/(.*AppsFlyerLib.*)([0-9]+\.[0-9]+\.[0-9]+)(.*)/\1$appsflyerLibVersion\3/g" Package.swift diff --git a/.github/workflows/release-QA-workflow.yml b/.github/workflows/release-QA-workflow.yml index c1dfe27..c9dfc03 100644 --- a/.github/workflows/release-QA-workflow.yml +++ b/.github/workflows/release-QA-workflow.yml @@ -25,7 +25,20 @@ jobs: if: needs.Check-If-ReleaseNotes-Pushed.outputs.answer == 'false' uses: ./.github/workflows/unit-tests-workflow.yml - Deploy-Locally-To-QA: + Prepere-To-QA: needs: [Run-Unit-Tests,Check-If-ReleaseNotes-Pushed] if: needs.Check-If-ReleaseNotes-Pushed.outputs.answer == 'false' uses: ./.github/workflows/prepare-for-QA-release.yml + + Release-To-QA: + needs: [Run-Unit-Tests,Check-If-ReleaseNotes-Pushed,Prepere-To-QA] + if: needs.Check-If-ReleaseNotes-Pushed.outputs.answer == 'false' + steps: + - name: Install Cocoapods + run: gem install cocoapods + - name: Push to COCOAPODS + uses: michaelhenry/deploy-to-cocoapods-github-action@1.0.10 + env: + COCOAPODS_TRUNK_TOKEN: ${{ secrets.CI_COCOAPODS_TOKEN }} + + From 6c51caf8a6762996b54b2a0d9789dbb3dcc90bf0 Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Mon, 10 Jun 2024 16:17:38 +0300 Subject: [PATCH 05/34] . --- .github/workflows/release-QA-workflow.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release-QA-workflow.yml b/.github/workflows/release-QA-workflow.yml index c9dfc03..fa64311 100644 --- a/.github/workflows/release-QA-workflow.yml +++ b/.github/workflows/release-QA-workflow.yml @@ -31,9 +31,12 @@ jobs: uses: ./.github/workflows/prepare-for-QA-release.yml Release-To-QA: + runs-on: macos-latest needs: [Run-Unit-Tests,Check-If-ReleaseNotes-Pushed,Prepere-To-QA] if: needs.Check-If-ReleaseNotes-Pushed.outputs.answer == 'false' steps: + - name: Checkout + uses: actions/checkout@v3 - name: Install Cocoapods run: gem install cocoapods - name: Push to COCOAPODS From 9d954a93eeae7bc1281692f272528996d62e037a Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Mon, 10 Jun 2024 16:38:15 +0300 Subject: [PATCH 06/34] . --- ...release.yml => prepare-for-QA-&-release.yml} | 9 +++++++++ .github/workflows/release-QA-workflow.yml | 17 +---------------- 2 files changed, 10 insertions(+), 16 deletions(-) rename .github/workflows/{prepare-for-QA-release.yml => prepare-for-QA-&-release.yml} (79%) diff --git a/.github/workflows/prepare-for-QA-release.yml b/.github/workflows/prepare-for-QA-&-release.yml similarity index 79% rename from .github/workflows/prepare-for-QA-release.yml rename to .github/workflows/prepare-for-QA-&-release.yml index 8ec238a..ae6a1c3 100644 --- a/.github/workflows/prepare-for-QA-release.yml +++ b/.github/workflows/prepare-for-QA-&-release.yml @@ -30,4 +30,13 @@ jobs: tag: "${{env.PLUGIN_VERSION_RC}} --force" tag_push: '--force' + Release-To-QA: + - name: Install Cocoapods + run: gem install cocoapods + - name: Push to COCOAPODS + uses: michaelhenry/deploy-to-cocoapods-github-action@1.0.10 + env: + COCOAPODS_TRUNK_TOKEN: ${{ secrets.CI_COCOAPODS_TOKEN }} + + diff --git a/.github/workflows/release-QA-workflow.yml b/.github/workflows/release-QA-workflow.yml index fa64311..7e6e39c 100644 --- a/.github/workflows/release-QA-workflow.yml +++ b/.github/workflows/release-QA-workflow.yml @@ -28,20 +28,5 @@ jobs: Prepere-To-QA: needs: [Run-Unit-Tests,Check-If-ReleaseNotes-Pushed] if: needs.Check-If-ReleaseNotes-Pushed.outputs.answer == 'false' - uses: ./.github/workflows/prepare-for-QA-release.yml - - Release-To-QA: - runs-on: macos-latest - needs: [Run-Unit-Tests,Check-If-ReleaseNotes-Pushed,Prepere-To-QA] - if: needs.Check-If-ReleaseNotes-Pushed.outputs.answer == 'false' - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Install Cocoapods - run: gem install cocoapods - - name: Push to COCOAPODS - uses: michaelhenry/deploy-to-cocoapods-github-action@1.0.10 - env: - COCOAPODS_TRUNK_TOKEN: ${{ secrets.CI_COCOAPODS_TOKEN }} - + uses: ./.github/workflows/prepare-for-QA-&-release.yml From eec1ea00f7bd1495a06498a53fff79b2d452ad63 Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Mon, 10 Jun 2024 17:47:59 +0300 Subject: [PATCH 07/34] . --- .github/workflows/prepare-for-QA-&-release.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/prepare-for-QA-&-release.yml b/.github/workflows/prepare-for-QA-&-release.yml index ae6a1c3..485620d 100644 --- a/.github/workflows/prepare-for-QA-&-release.yml +++ b/.github/workflows/prepare-for-QA-&-release.yml @@ -34,9 +34,13 @@ jobs: - name: Install Cocoapods run: gem install cocoapods - name: Push to COCOAPODS - uses: michaelhenry/deploy-to-cocoapods-github-action@1.0.10 + # uses: michaelhenry/deploy-to-cocoapods-github-action@1.0.10 + # env: + # COCOAPODS_TRUNK_TOKEN: ${{ secrets.CI_COCOAPODS_TOKEN }} env: COCOAPODS_TRUNK_TOKEN: ${{ secrets.CI_COCOAPODS_TOKEN }} + run: | + pod trunk push segment-appsflyer-ios-qa.podspec From 03d983e2c63b0ffbc8e89e851d24ea4d704dc9b1 Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Mon, 10 Jun 2024 18:01:18 +0300 Subject: [PATCH 08/34] . --- .github/workflows/prepare-for-QA-&-release.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/prepare-for-QA-&-release.yml b/.github/workflows/prepare-for-QA-&-release.yml index 485620d..07488c3 100644 --- a/.github/workflows/prepare-for-QA-&-release.yml +++ b/.github/workflows/prepare-for-QA-&-release.yml @@ -34,13 +34,9 @@ jobs: - name: Install Cocoapods run: gem install cocoapods - name: Push to COCOAPODS - # uses: michaelhenry/deploy-to-cocoapods-github-action@1.0.10 - # env: - # COCOAPODS_TRUNK_TOKEN: ${{ secrets.CI_COCOAPODS_TOKEN }} + uses: michaelhenry/deploy-to-cocoapods-github-action@1.0.10 env: - COCOAPODS_TRUNK_TOKEN: ${{ secrets.CI_COCOAPODS_TOKEN }} - run: | - pod trunk push segment-appsflyer-ios-qa.podspec + COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }} From 8361cddc138eb9b62727d702bad96bd8f4439907 Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Tue, 11 Jun 2024 10:06:16 +0300 Subject: [PATCH 09/34] self_host --- .github/workflows/prepare-for-QA-&-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/prepare-for-QA-&-release.yml b/.github/workflows/prepare-for-QA-&-release.yml index 07488c3..7250a5e 100644 --- a/.github/workflows/prepare-for-QA-&-release.yml +++ b/.github/workflows/prepare-for-QA-&-release.yml @@ -6,7 +6,7 @@ on: jobs: Change-HardCoded-Version: name: Pre Release - runs-on: macos-latest + runs-on: [ios, self-hosted] steps: - name: Checkout uses: actions/checkout@v3 From 1e79680fa76b80f427bcbf9a5283d08fd6b330e5 Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Tue, 11 Jun 2024 10:17:29 +0300 Subject: [PATCH 10/34] . --- .github/workflows/prepare-for-QA-&-release.yml | 6 +----- .github/workflows/release-QA-workflow.yml | 8 ++++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/prepare-for-QA-&-release.yml b/.github/workflows/prepare-for-QA-&-release.yml index 7250a5e..266db7f 100644 --- a/.github/workflows/prepare-for-QA-&-release.yml +++ b/.github/workflows/prepare-for-QA-&-release.yml @@ -28,11 +28,7 @@ jobs: message: 'Commited from github action - prepaing the repo for QA locally.' add: '.' tag: "${{env.PLUGIN_VERSION_RC}} --force" - tag_push: '--force' - - Release-To-QA: - - name: Install Cocoapods - run: gem install cocoapods + tag_push: '--force' - name: Push to COCOAPODS uses: michaelhenry/deploy-to-cocoapods-github-action@1.0.10 env: diff --git a/.github/workflows/release-QA-workflow.yml b/.github/workflows/release-QA-workflow.yml index 7e6e39c..1adf787 100644 --- a/.github/workflows/release-QA-workflow.yml +++ b/.github/workflows/release-QA-workflow.yml @@ -20,10 +20,10 @@ jobs: releasenotesfile: - 'releasenotes.**' - Run-Unit-Tests: - needs: Check-If-ReleaseNotes-Pushed - if: needs.Check-If-ReleaseNotes-Pushed.outputs.answer == 'false' - uses: ./.github/workflows/unit-tests-workflow.yml + # Run-Unit-Tests: + # needs: Check-If-ReleaseNotes-Pushed + # if: needs.Check-If-ReleaseNotes-Pushed.outputs.answer == 'false' + # uses: ./.github/workflows/unit-tests-workflow.yml Prepere-To-QA: needs: [Run-Unit-Tests,Check-If-ReleaseNotes-Pushed] From ef998977439f60281cab0141608f30637234fd95 Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Tue, 11 Jun 2024 10:19:30 +0300 Subject: [PATCH 11/34] . --- .github/workflows/release-QA-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-QA-workflow.yml b/.github/workflows/release-QA-workflow.yml index 1adf787..3def389 100644 --- a/.github/workflows/release-QA-workflow.yml +++ b/.github/workflows/release-QA-workflow.yml @@ -26,7 +26,7 @@ jobs: # uses: ./.github/workflows/unit-tests-workflow.yml Prepere-To-QA: - needs: [Run-Unit-Tests,Check-If-ReleaseNotes-Pushed] + needs: [Check-If-ReleaseNotes-Pushed] if: needs.Check-If-ReleaseNotes-Pushed.outputs.answer == 'false' uses: ./.github/workflows/prepare-for-QA-&-release.yml From a8250fb2aa14e1f60d33e78d786629978a724ff6 Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Tue, 11 Jun 2024 10:31:07 +0300 Subject: [PATCH 12/34] . --- .github/workflows/prepare-for-QA-&-release.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/prepare-for-QA-&-release.yml b/.github/workflows/prepare-for-QA-&-release.yml index 266db7f..5dde7d1 100644 --- a/.github/workflows/prepare-for-QA-&-release.yml +++ b/.github/workflows/prepare-for-QA-&-release.yml @@ -30,9 +30,8 @@ jobs: tag: "${{env.PLUGIN_VERSION_RC}} --force" tag_push: '--force' - name: Push to COCOAPODS - uses: michaelhenry/deploy-to-cocoapods-github-action@1.0.10 - env: - COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }} + run: | + pod trunk push segment-appsflyer-ios-qa.podspec From f22115093ad333fd565183d8bcf78cac7c13b2ea Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Tue, 11 Jun 2024 10:52:44 +0300 Subject: [PATCH 13/34] . --- .github/workflows/prepare-for-QA-&-release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/prepare-for-QA-&-release.yml b/.github/workflows/prepare-for-QA-&-release.yml index 5dde7d1..fcf84ea 100644 --- a/.github/workflows/prepare-for-QA-&-release.yml +++ b/.github/workflows/prepare-for-QA-&-release.yml @@ -31,6 +31,7 @@ jobs: tag_push: '--force' - name: Push to COCOAPODS run: | + pod trunk me pod trunk push segment-appsflyer-ios-qa.podspec From fd7beb7ee7811a63061663e87da165c96454e7f9 Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Thu, 13 Jun 2024 11:59:29 +0300 Subject: [PATCH 14/34] =?UTF-8?q?=D7=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Classes/SEGAppsFlyerIntegration.m | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/segment-appsflyer-ios/Classes/SEGAppsFlyerIntegration.m b/segment-appsflyer-ios/Classes/SEGAppsFlyerIntegration.m index 304af66..5465413 100644 --- a/segment-appsflyer-ios/Classes/SEGAppsFlyerIntegration.m +++ b/segment-appsflyer-ios/Classes/SEGAppsFlyerIntegration.m @@ -165,7 +165,13 @@ - (void)identify:(SEGIdentifyPayload *)payload } - (void) start { - [self.appsflyer start]; + [self.appsflyer startWithCompletionHandler:^(NSDictionary * _Nullable dictionary, NSError * _Nullable error) { + if(error == nil){ + + [self.appsflyer logEvent:@"Start-Success" withValues:@{}]; + + } + }]; } @@ -257,7 +263,7 @@ - (void)onConversionDataSuccess:(nonnull NSDictionary *)conversionInfo { // If you are working with networks that don't allow passing user level data to 3rd parties, // you will need to apply code to filter out these networks before calling // `[self.analytics track:@"Install Attributed" properties:[properties copy]];` - [self.analytics track:@"Install Attributed" properties: [properties copy]]; + [self.analytics track:@"GCD-Success" properties: [properties copy]]; } From 82e18c164451096a0d6d4d6f3c9f7c63244f53d2 Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Thu, 13 Jun 2024 12:07:36 +0300 Subject: [PATCH 15/34] fix test --- SegmentAppsFlyeriOSTests/SEGAppsFlyerIntegrationTests.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SegmentAppsFlyeriOSTests/SEGAppsFlyerIntegrationTests.m b/SegmentAppsFlyeriOSTests/SEGAppsFlyerIntegrationTests.m index 1b5a8d5..b83a908 100644 --- a/SegmentAppsFlyeriOSTests/SEGAppsFlyerIntegrationTests.m +++ b/SegmentAppsFlyeriOSTests/SEGAppsFlyerIntegrationTests.m @@ -431,7 +431,7 @@ - (void)testSEGAppsFlyerIntegration_onConversionDataSuccess_happyflow{ return YES; }]]); OCMStub([SEGAnalyticsMock track:[OCMArg checkWithBlock:^BOOL(id obj) { - XCTAssertTrue([obj isEqual:@"Install Attributed"]); + XCTAssertTrue([obj isEqual:@"GCD_Success"]); return YES; }] properties:[OCMArg checkWithBlock:^BOOL(id obj) { XCTAssertTrue([obj isEqualToDictionary:dictionaryInputToAnalytics]); From 16a35feb0ea053931719cff744de562db2cfa9dd Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Thu, 13 Jun 2024 12:11:32 +0300 Subject: [PATCH 16/34] fix some script stuff --- .github/bash_scripts/pre_release.sh | 4 ++-- .github/bash_scripts/release.sh | 2 ++ .github/workflows/prepare-for-release-workflow.yml | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/bash_scripts/pre_release.sh b/.github/bash_scripts/pre_release.sh index a482bb1..70a55b1 100644 --- a/.github/bash_scripts/pre_release.sh +++ b/.github/bash_scripts/pre_release.sh @@ -10,8 +10,8 @@ mv segment-appsflyer-ios.podspec segment-appsflyer-ios-qa.podspec sed -r -i '' "s/(.*AppsFlyerLib.*)([0-9]+\.[0-9]+\.[0-9]+)(.*)/\1$appsflyerLibVersion\3/g" Package.swift -sed -r -i '' "s/(.*pod \'segment-appsflyer-ios\')(.*\'[0-9]+\.[0-9]+\.[0-9]+\')/\1,:podspec => \'\.\.\/\.\.\/segment-appsflyer-ios.podspec\'/g" examples/SwiftPodsSample/Podfile -sed -r -i '' "s/(.*pod \'segment-appsflyer-ios\')(.*\'[0-9]+\.[0-9]+\.[0-9]+\')/\1,:podspec => \'\.\.\/\.\.\/segment-appsflyer-ios.podspec\'/g" examples/ObjcPodsSample/Podfile +sed -r -i '' "s/(.*pod \'segment-appsflyer-ios\')(.*\'[0-9]+\.[0-9]+\.[0-9]+\')/\1,\'$rcVersion\'/g" examples/SwiftPodsSample/Podfile +sed -r -i '' "s/(.*pod \'segment-appsflyer-ios\')(.*\'[0-9]+\.[0-9]+\.[0-9]+\')/\1,\'$rcVersion\'/g" examples/ObjcPodsSample/Podfile sed -r -i '' "s/(## This is a Segment wrapper for AppsFlyer SDK that is built with iOS SDK v)(.*)/\1$appsflyerLibVersion./g" README.md sed -r -i '' "s/(.*pod \'segment-appsflyer-ios.*)([0-9]+\.[0-9]+\.[0-9]+)(.*)/\1$appsflyerLibVersion\3/g" README.md diff --git a/.github/bash_scripts/release.sh b/.github/bash_scripts/release.sh index a99f077..257fa23 100644 --- a/.github/bash_scripts/release.sh +++ b/.github/bash_scripts/release.sh @@ -3,6 +3,8 @@ releaseVersion=$1 sed -r -i '' "s/version_plugin = \'[0-9]+\.[0-9]+\.[0-9]+\'/version_plugin = \'$releaseVersion\'/g" segment-appsflyer-ios.podspec +sed -i '' "s/s.name = \"segment-appsflyer-ios-qa\"/s.name = \"segment-appsflyer-ios\"/g" segment-appsflyer-ios.podspec +mv segment-appsflyer-ios-qa.podspec segment-appsflyer-ios.podspec sed -r -i '' "s/(.*pod \'segment-appsflyer-ios\')(.*)/\1,\'$releaseVersion\'/g" examples/SwiftPodsSample/Podfile sed -r -i '' "s/(.*pod \'segment-appsflyer-ios\')(.*)/\1,\'$releaseVersion\'/g" examples/ObjcPodsSample/Podfile diff --git a/.github/workflows/prepare-for-release-workflow.yml b/.github/workflows/prepare-for-release-workflow.yml index 99bd4bc..935bfae 100644 --- a/.github/workflows/prepare-for-release-workflow.yml +++ b/.github/workflows/prepare-for-release-workflow.yml @@ -6,7 +6,6 @@ on: - opened branches: - 'master' - # - 'dev/add-release-workflow' jobs: Prepare-Plugin-For-Production: From c379782f4bb705acee309d106159b9f2aba11b19 Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Thu, 13 Jun 2024 12:13:01 +0300 Subject: [PATCH 17/34] fix test #2 --- SegmentAppsFlyeriOSTests/SEGAppsFlyerIntegrationTests.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SegmentAppsFlyeriOSTests/SEGAppsFlyerIntegrationTests.m b/SegmentAppsFlyeriOSTests/SEGAppsFlyerIntegrationTests.m index b83a908..104b041 100644 --- a/SegmentAppsFlyeriOSTests/SEGAppsFlyerIntegrationTests.m +++ b/SegmentAppsFlyeriOSTests/SEGAppsFlyerIntegrationTests.m @@ -431,7 +431,7 @@ - (void)testSEGAppsFlyerIntegration_onConversionDataSuccess_happyflow{ return YES; }]]); OCMStub([SEGAnalyticsMock track:[OCMArg checkWithBlock:^BOOL(id obj) { - XCTAssertTrue([obj isEqual:@"GCD_Success"]); + XCTAssertTrue([obj isEqual:@"GCD-Success"]); return YES; }] properties:[OCMArg checkWithBlock:^BOOL(id obj) { XCTAssertTrue([obj isEqualToDictionary:dictionaryInputToAnalytics]); From ed2f89ecee968928d5281b21c2581e316ce68cfe Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Thu, 13 Jun 2024 12:23:45 +0300 Subject: [PATCH 18/34] . --- .github/bash_scripts/release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/bash_scripts/release.sh b/.github/bash_scripts/release.sh index 257fa23..f49c487 100644 --- a/.github/bash_scripts/release.sh +++ b/.github/bash_scripts/release.sh @@ -2,8 +2,8 @@ releaseVersion=$1 -sed -r -i '' "s/version_plugin = \'[0-9]+\.[0-9]+\.[0-9]+\'/version_plugin = \'$releaseVersion\'/g" segment-appsflyer-ios.podspec -sed -i '' "s/s.name = \"segment-appsflyer-ios-qa\"/s.name = \"segment-appsflyer-ios\"/g" segment-appsflyer-ios.podspec +sed -r -i '' "s/version_plugin = \'[0-9]+\.[0-9]+\.[0-9]+.*\'/version_plugin = \'$releaseVersion\'/g" segment-appsflyer-ios-qa.podspec +sed -i '' "s/s.name = \"segment-appsflyer-ios-qa\"/s.name = \"segment-appsflyer-ios\"/g" segment-appsflyer-ios-qa.podspec mv segment-appsflyer-ios-qa.podspec segment-appsflyer-ios.podspec sed -r -i '' "s/(.*pod \'segment-appsflyer-ios\')(.*)/\1,\'$releaseVersion\'/g" examples/SwiftPodsSample/Podfile From 62c662af438fe223b4e64c45315dc9a5c5dc466c Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Thu, 13 Jun 2024 12:38:42 +0300 Subject: [PATCH 19/34] . --- .github/workflows/release-production-workflow.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-production-workflow.yml b/.github/workflows/release-production-workflow.yml index 0eeed02..8faa53e 100644 --- a/.github/workflows/release-production-workflow.yml +++ b/.github/workflows/release-production-workflow.yml @@ -11,7 +11,7 @@ on: jobs: Deploy-To-Production: if: github.event.pull_request.merged == true && startsWith(github.head_ref, 'releases/') - runs-on: macos-latest + runs-on: [ios, self-hosted] steps: - name: Checkout uses: actions/checkout@v3 @@ -49,9 +49,9 @@ jobs: - name: Install Cocoapods run: gem install cocoapods - name: Push to COCOAPODS - uses: michaelhenry/deploy-to-cocoapods-github-action@1.0.10 - env: - COCOAPODS_TRUNK_TOKEN: ${{ secrets.CI_COCOAPODS_TOKEN }} + run: | + pod trunk me + pod trunk push segment-appsflyer-ios.podspec - name: Notify with SLack uses: slackapi/slack-github-action@v1.23.0 with: From 93620a3254a423b8bd4fcc0e63dbe085c658d6cd Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Thu, 13 Jun 2024 12:45:55 +0300 Subject: [PATCH 20/34] remove completion handler from start --- segment-appsflyer-ios/Classes/SEGAppsFlyerIntegration.m | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/segment-appsflyer-ios/Classes/SEGAppsFlyerIntegration.m b/segment-appsflyer-ios/Classes/SEGAppsFlyerIntegration.m index 5465413..94c368e 100644 --- a/segment-appsflyer-ios/Classes/SEGAppsFlyerIntegration.m +++ b/segment-appsflyer-ios/Classes/SEGAppsFlyerIntegration.m @@ -165,13 +165,7 @@ - (void)identify:(SEGIdentifyPayload *)payload } - (void) start { - [self.appsflyer startWithCompletionHandler:^(NSDictionary * _Nullable dictionary, NSError * _Nullable error) { - if(error == nil){ - - [self.appsflyer logEvent:@"Start-Success" withValues:@{}]; - - } - }]; + [self.appsflyer start]; } From 48bdae9fc0c60867e7f96a67e7a88de61660c1b5 Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Thu, 13 Jun 2024 15:22:17 +0300 Subject: [PATCH 21/34] . --- .github/bash_scripts/pre_release.sh | 4 ++-- .github/bash_scripts/release.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/bash_scripts/pre_release.sh b/.github/bash_scripts/pre_release.sh index 70a55b1..8089ade 100644 --- a/.github/bash_scripts/pre_release.sh +++ b/.github/bash_scripts/pre_release.sh @@ -10,8 +10,8 @@ mv segment-appsflyer-ios.podspec segment-appsflyer-ios-qa.podspec sed -r -i '' "s/(.*AppsFlyerLib.*)([0-9]+\.[0-9]+\.[0-9]+)(.*)/\1$appsflyerLibVersion\3/g" Package.swift -sed -r -i '' "s/(.*pod \'segment-appsflyer-ios\')(.*\'[0-9]+\.[0-9]+\.[0-9]+\')/\1,\'$rcVersion\'/g" examples/SwiftPodsSample/Podfile -sed -r -i '' "s/(.*pod \'segment-appsflyer-ios\')(.*\'[0-9]+\.[0-9]+\.[0-9]+\')/\1,\'$rcVersion\'/g" examples/ObjcPodsSample/Podfile +sed -r -i '' "s/(.*pod \'segment-appsflyer-ios)\'(.*\'[0-9]+\.[0-9]+\.[0-9]+\')/\1\',\'$rcVersion\'/g" examples/SwiftPodsSample/Podfile +sed -r -i '' "s/(.*pod \'segment-appsflyer-ios)\'(.*\'[0-9]+\.[0-9]+\.[0-9]+\')/\1\',\'$rcVersion\'/g" examples/ObjcPodsSample/Podfile sed -r -i '' "s/(## This is a Segment wrapper for AppsFlyer SDK that is built with iOS SDK v)(.*)/\1$appsflyerLibVersion./g" README.md sed -r -i '' "s/(.*pod \'segment-appsflyer-ios.*)([0-9]+\.[0-9]+\.[0-9]+)(.*)/\1$appsflyerLibVersion\3/g" README.md diff --git a/.github/bash_scripts/release.sh b/.github/bash_scripts/release.sh index f49c487..9944fa2 100644 --- a/.github/bash_scripts/release.sh +++ b/.github/bash_scripts/release.sh @@ -6,8 +6,8 @@ sed -r -i '' "s/version_plugin = \'[0-9]+\.[0-9]+\.[0-9]+.*\'/version_plugin = \ sed -i '' "s/s.name = \"segment-appsflyer-ios-qa\"/s.name = \"segment-appsflyer-ios\"/g" segment-appsflyer-ios-qa.podspec mv segment-appsflyer-ios-qa.podspec segment-appsflyer-ios.podspec -sed -r -i '' "s/(.*pod \'segment-appsflyer-ios\')(.*)/\1,\'$releaseVersion\'/g" examples/SwiftPodsSample/Podfile -sed -r -i '' "s/(.*pod \'segment-appsflyer-ios\')(.*)/\1,\'$releaseVersion\'/g" examples/ObjcPodsSample/Podfile +sed -r -i '' "s/(.*pod \'segment-appsflyer-ios)-qa\'(.*)/\1\',\'$releaseVersion\'/g" examples/SwiftPodsSample/Podfile +sed -r -i '' "s/(.*pod \'segment-appsflyer-ios)-qa\'(.*)/\1\',\'$releaseVersion\'/g" examples/ObjcPodsSample/Podfile sed -i '' 's/^/* /' "releasenotes.$releaseVersion" NEW_VERSION_RELEASE_NOTES=$(cat "releasenotes.$releaseVersion") From 10886ddb27a27baf0df7ea1a7e407678f4bec5d4 Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Thu, 13 Jun 2024 16:39:28 +0300 Subject: [PATCH 22/34] . --- .github/workflows/release-QA-workflow.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-QA-workflow.yml b/.github/workflows/release-QA-workflow.yml index 3def389..4045655 100644 --- a/.github/workflows/release-QA-workflow.yml +++ b/.github/workflows/release-QA-workflow.yml @@ -20,10 +20,10 @@ jobs: releasenotesfile: - 'releasenotes.**' - # Run-Unit-Tests: - # needs: Check-If-ReleaseNotes-Pushed - # if: needs.Check-If-ReleaseNotes-Pushed.outputs.answer == 'false' - # uses: ./.github/workflows/unit-tests-workflow.yml + Run-Unit-Tests: + needs: Check-If-ReleaseNotes-Pushed + if: needs.Check-If-ReleaseNotes-Pushed.outputs.answer == 'false' + uses: ./.github/workflows/unit-tests-workflow.yml Prepere-To-QA: needs: [Check-If-ReleaseNotes-Pushed] From 97251046b33a0fbd998e7755f269432c8df2da9f Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Sun, 16 Jun 2024 09:54:21 +0300 Subject: [PATCH 23/34] naming jobs --- .github/workflows/prepare-for-QA-&-release.yml | 2 +- .github/workflows/release-QA-workflow.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/prepare-for-QA-&-release.yml b/.github/workflows/prepare-for-QA-&-release.yml index fcf84ea..0a91725 100644 --- a/.github/workflows/prepare-for-QA-&-release.yml +++ b/.github/workflows/prepare-for-QA-&-release.yml @@ -4,7 +4,7 @@ on: workflow_call: jobs: - Change-HardCoded-Version: + Change-HardCoded-Version-And-Then-Release: name: Pre Release runs-on: [ios, self-hosted] steps: diff --git a/.github/workflows/release-QA-workflow.yml b/.github/workflows/release-QA-workflow.yml index 4045655..f5d0fd0 100644 --- a/.github/workflows/release-QA-workflow.yml +++ b/.github/workflows/release-QA-workflow.yml @@ -25,7 +25,7 @@ jobs: if: needs.Check-If-ReleaseNotes-Pushed.outputs.answer == 'false' uses: ./.github/workflows/unit-tests-workflow.yml - Prepere-To-QA: + Prepere-To-QA-&-Release: needs: [Check-If-ReleaseNotes-Pushed] if: needs.Check-If-ReleaseNotes-Pushed.outputs.answer == 'false' uses: ./.github/workflows/prepare-for-QA-&-release.yml From 266e296b929850a991270c6de916212373c0cf88 Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Sun, 16 Jun 2024 11:43:42 +0300 Subject: [PATCH 24/34] . --- SegmentAppsFlyeriOSTests/SEGAppsFlyerIntegrationTests.m | 2 +- segment-appsflyer-ios/Classes/SEGAppsFlyerIntegration.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SegmentAppsFlyeriOSTests/SEGAppsFlyerIntegrationTests.m b/SegmentAppsFlyeriOSTests/SEGAppsFlyerIntegrationTests.m index 104b041..1b5a8d5 100644 --- a/SegmentAppsFlyeriOSTests/SEGAppsFlyerIntegrationTests.m +++ b/SegmentAppsFlyeriOSTests/SEGAppsFlyerIntegrationTests.m @@ -431,7 +431,7 @@ - (void)testSEGAppsFlyerIntegration_onConversionDataSuccess_happyflow{ return YES; }]]); OCMStub([SEGAnalyticsMock track:[OCMArg checkWithBlock:^BOOL(id obj) { - XCTAssertTrue([obj isEqual:@"GCD-Success"]); + XCTAssertTrue([obj isEqual:@"Install Attributed"]); return YES; }] properties:[OCMArg checkWithBlock:^BOOL(id obj) { XCTAssertTrue([obj isEqualToDictionary:dictionaryInputToAnalytics]); diff --git a/segment-appsflyer-ios/Classes/SEGAppsFlyerIntegration.m b/segment-appsflyer-ios/Classes/SEGAppsFlyerIntegration.m index 94c368e..304af66 100644 --- a/segment-appsflyer-ios/Classes/SEGAppsFlyerIntegration.m +++ b/segment-appsflyer-ios/Classes/SEGAppsFlyerIntegration.m @@ -257,7 +257,7 @@ - (void)onConversionDataSuccess:(nonnull NSDictionary *)conversionInfo { // If you are working with networks that don't allow passing user level data to 3rd parties, // you will need to apply code to filter out these networks before calling // `[self.analytics track:@"Install Attributed" properties:[properties copy]];` - [self.analytics track:@"GCD-Success" properties: [properties copy]]; + [self.analytics track:@"Install Attributed" properties: [properties copy]]; } From b578a5da0f4b6623e94cadd4db27cabee58bb8ce Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Wed, 7 Aug 2024 13:03:22 +0300 Subject: [PATCH 25/34] ci changes --- ...re-for-QA-&-release.yml => prepare-for-QA-and-release.yml} | 0 .github/workflows/release-QA-workflow.yml | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename .github/workflows/{prepare-for-QA-&-release.yml => prepare-for-QA-and-release.yml} (100%) diff --git a/.github/workflows/prepare-for-QA-&-release.yml b/.github/workflows/prepare-for-QA-and-release.yml similarity index 100% rename from .github/workflows/prepare-for-QA-&-release.yml rename to .github/workflows/prepare-for-QA-and-release.yml diff --git a/.github/workflows/release-QA-workflow.yml b/.github/workflows/release-QA-workflow.yml index f5d0fd0..ecdc417 100644 --- a/.github/workflows/release-QA-workflow.yml +++ b/.github/workflows/release-QA-workflow.yml @@ -25,8 +25,8 @@ jobs: if: needs.Check-If-ReleaseNotes-Pushed.outputs.answer == 'false' uses: ./.github/workflows/unit-tests-workflow.yml - Prepere-To-QA-&-Release: + Prepere-To-QA-and-Release: needs: [Check-If-ReleaseNotes-Pushed] if: needs.Check-If-ReleaseNotes-Pushed.outputs.answer == 'false' - uses: ./.github/workflows/prepare-for-QA-&-release.yml + uses: ./.github/workflows/prepare-for-QA-and-release.yml From 22354cbb4437697d2bddeeda7cfcb609472430c7 Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Wed, 7 Aug 2024 14:45:11 +0300 Subject: [PATCH 26/34] tests change --- SegmentAppsFlyeriOSTests/SEGAppsFlyerIntegrationTests.m | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/SegmentAppsFlyeriOSTests/SEGAppsFlyerIntegrationTests.m b/SegmentAppsFlyeriOSTests/SEGAppsFlyerIntegrationTests.m index 1b5a8d5..8efb4e9 100644 --- a/SegmentAppsFlyeriOSTests/SEGAppsFlyerIntegrationTests.m +++ b/SegmentAppsFlyeriOSTests/SEGAppsFlyerIntegrationTests.m @@ -479,6 +479,7 @@ - (void)testSEGAppsFlyerIntegration_onConversionDataFail_happyflow{ id SEGAppsFlyerIntegrationTestsMock = OCMClassMock([SEGAppsFlyerIntegrationTests class]); OCMStub([SEGAppsFlyerIntegrationTestsMock onConversionDataFail:[OCMArg checkWithBlock:^BOOL(id obj) { XCTAssertTrue([obj isEqual:error]); + return true; }]]); SEGAppsFlyerIntegration *integrationObject = [[SEGAppsFlyerIntegration alloc] initWithSettings:@{} withAnalytics:nil andDelegate:SEGAppsFlyerIntegrationTestsMock]; @@ -497,6 +498,7 @@ - (void)testSEGAppsFlyerIntegration_onAppOpenAttribution_happyflow{ id SEGAppsFlyerIntegrationTestsMock = OCMClassMock([SEGAppsFlyerIntegrationTests class]); OCMStub([SEGAppsFlyerIntegrationTestsMock onAppOpenAttribution:[OCMArg checkWithBlock:^BOOL(id obj) { XCTAssertTrue([obj isEqualToDictionary:attributionData]); + return true; }]]); SEGAppsFlyerIntegration *integrationObject = [[SEGAppsFlyerIntegration alloc] initWithSettings:@{} withAnalytics:nil andDelegate:SEGAppsFlyerIntegrationTestsMock]; @@ -515,6 +517,7 @@ - (void)testSEGAppsFlyerIntegration_onAppOpenAttributionFailure_happyflow{ id SEGAppsFlyerIntegrationTestsMock = OCMClassMock([SEGAppsFlyerIntegrationTests class]); OCMStub([SEGAppsFlyerIntegrationTestsMock onAppOpenAttribution:[OCMArg checkWithBlock:^BOOL(id obj) { XCTAssertTrue([obj isEqual:error]); + return true; }]]); SEGAppsFlyerIntegration *integrationObject = [[SEGAppsFlyerIntegration alloc] initWithSettings:@{} withAnalytics:nil andDelegate:SEGAppsFlyerIntegrationTestsMock]; @@ -533,6 +536,7 @@ - (void)testSEGAppsFlyerIntegration_didResolveDeepLink_happyflow{ id SEGAppsFlyerIntegrationTestsMock = OCMClassMock([SEGAppsFlyerIntegrationTests class]); OCMStub([SEGAppsFlyerIntegrationTestsMock onAppOpenAttribution:[OCMArg checkWithBlock:^BOOL(id obj) { XCTAssertTrue([obj isEqual:result]); + return true; }]]); SEGAppsFlyerIntegration *integrationObject = [[SEGAppsFlyerIntegration alloc] initWithSettings:@{} withAnalytics:nil andDelegate:SEGAppsFlyerIntegrationTestsMock]; From b697b0fb0824e7ed6b60a0d43e8da90fff834403 Mon Sep 17 00:00:00 2001 From: morisgateno-appsflyer <121490279+morisgateno-appsflyer@users.noreply.github.com> Date: Thu, 8 Aug 2024 10:48:56 +0300 Subject: [PATCH 27/34] Update unit-tests-workflow.yml --- .github/workflows/unit-tests-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-tests-workflow.yml b/.github/workflows/unit-tests-workflow.yml index e187e2f..845614e 100644 --- a/.github/workflows/unit-tests-workflow.yml +++ b/.github/workflows/unit-tests-workflow.yml @@ -7,7 +7,7 @@ on: workflow_call: jobs: Tests: - runs-on: macos-12 + runs-on: macos-latest steps: - uses: actions/checkout@v2 - uses: maxim-lobanov/setup-xcode@v1 From 9a4214154d5cc3e3f6a1b6dbf99e44b55341b424 Mon Sep 17 00:00:00 2001 From: morisgateno-appsflyer <121490279+morisgateno-appsflyer@users.noreply.github.com> Date: Thu, 8 Aug 2024 10:52:13 +0300 Subject: [PATCH 28/34] Update unit-tests-workflow.yml --- .github/workflows/unit-tests-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-tests-workflow.yml b/.github/workflows/unit-tests-workflow.yml index 845614e..7f31d39 100644 --- a/.github/workflows/unit-tests-workflow.yml +++ b/.github/workflows/unit-tests-workflow.yml @@ -18,4 +18,4 @@ jobs: - name: CocoaPod Install run: pod install - name: Test - run: xcodebuild test -scheme segment-appsflyer-ios -workspace segment-appsflyer-ios.xcworkspace -destination 'platform=iOS Simulator,name=iPhone 13' | xcpretty && exit ${PIPESTATUS[0]} + run: xcodebuild test -scheme segment-appsflyer-ios -workspace segment-appsflyer-ios.xcworkspace -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' | xcpretty && exit ${PIPESTATUS[0]} From 7f38fad9ab94a7411c33e97c9254d37b316d481a Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Sun, 11 Aug 2024 09:53:44 +0300 Subject: [PATCH 29/34] swift_version changes - deprecated. --- .swift-version | 1 - segment-appsflyer-ios.podspec | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 .swift-version diff --git a/.swift-version b/.swift-version deleted file mode 100644 index 8c50098..0000000 --- a/.swift-version +++ /dev/null @@ -1 +0,0 @@ -3.1 diff --git a/segment-appsflyer-ios.podspec b/segment-appsflyer-ios.podspec index 82e228a..dc8b80c 100644 --- a/segment-appsflyer-ios.podspec +++ b/segment-appsflyer-ios.podspec @@ -20,6 +20,7 @@ Pod::Spec.new do |s| s.tvos.deployment_target = '12.0' s.requires_arc = true s.static_framework = true + s.swift_version = '4.0' s.dependency 'Analytics' From c08e17ec183274376497d4093cf6b930e3875771 Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Sun, 11 Aug 2024 12:29:07 +0300 Subject: [PATCH 30/34] cocopods push modification --- .github/workflows/prepare-for-QA-and-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/prepare-for-QA-and-release.yml b/.github/workflows/prepare-for-QA-and-release.yml index 0a91725..c4381f7 100644 --- a/.github/workflows/prepare-for-QA-and-release.yml +++ b/.github/workflows/prepare-for-QA-and-release.yml @@ -32,7 +32,7 @@ jobs: - name: Push to COCOAPODS run: | pod trunk me - pod trunk push segment-appsflyer-ios-qa.podspec + pod trunk push segment-appsflyer-ios-qa.podspec --verbose --use-libraries --allow-warnings From 474c00e49ecbb7effcbd130ddd02abd27ddff50b Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Tue, 20 Aug 2024 12:35:00 +0300 Subject: [PATCH 31/34] added a pod push flags --- .github/workflows/release-production-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-production-workflow.yml b/.github/workflows/release-production-workflow.yml index 8faa53e..2111802 100644 --- a/.github/workflows/release-production-workflow.yml +++ b/.github/workflows/release-production-workflow.yml @@ -51,7 +51,7 @@ jobs: - name: Push to COCOAPODS run: | pod trunk me - pod trunk push segment-appsflyer-ios.podspec + pod trunk push segment-appsflyer-ios.podspec --verbose --use-libraries --allow-warnings - name: Notify with SLack uses: slackapi/slack-github-action@v1.23.0 with: From 2005a8fdb22f2a0be526634550bb8261ec2a4216 Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Tue, 20 Aug 2024 14:00:57 +0300 Subject: [PATCH 32/34] fix for actions and test app --- .github/bash_scripts/pre_release.sh | 4 +- .../SwiftPodsSample.xcodeproj/project.pbxproj | 32 +++- .../SwiftPodsSample/AppDelegate.swift | 23 +-- .../SwiftPodsSample/Info.plist | 23 +-- .../SwiftPodsSample/SceneDelegate.swift | 52 ------- .../SwiftPodsSample.entitlements | 10 ++ .../SwiftPodsSample/ViewController.swift | 13 ++ .../project.pbxproj | 137 +++++++++++++++++- 8 files changed, 196 insertions(+), 98 deletions(-) delete mode 100644 examples/SwiftPodsSample/SwiftPodsSample/SceneDelegate.swift create mode 100644 examples/SwiftPodsSample/SwiftPodsSample/SwiftPodsSample.entitlements diff --git a/.github/bash_scripts/pre_release.sh b/.github/bash_scripts/pre_release.sh index 8089ade..d677de9 100644 --- a/.github/bash_scripts/pre_release.sh +++ b/.github/bash_scripts/pre_release.sh @@ -10,8 +10,8 @@ mv segment-appsflyer-ios.podspec segment-appsflyer-ios-qa.podspec sed -r -i '' "s/(.*AppsFlyerLib.*)([0-9]+\.[0-9]+\.[0-9]+)(.*)/\1$appsflyerLibVersion\3/g" Package.swift -sed -r -i '' "s/(.*pod \'segment-appsflyer-ios)\'(.*\'[0-9]+\.[0-9]+\.[0-9]+\')/\1\',\'$rcVersion\'/g" examples/SwiftPodsSample/Podfile -sed -r -i '' "s/(.*pod \'segment-appsflyer-ios)\'(.*\'[0-9]+\.[0-9]+\.[0-9]+\')/\1\',\'$rcVersion\'/g" examples/ObjcPodsSample/Podfile +sed -r -i '' "s/(.*pod \'segment-appsflyer-ios)\'(.*\'[0-9]+\.[0-9]+\.[0-9]+\')/\1-qa\',\'$rcVersion\'/g" examples/SwiftPodsSample/Podfile +sed -r -i '' "s/(.*pod \'segment-appsflyer-ios)\'(.*\'[0-9]+\.[0-9]+\.[0-9]+\')/\1-qa\',\'$rcVersion\'/g" examples/ObjcPodsSample/Podfile sed -r -i '' "s/(## This is a Segment wrapper for AppsFlyer SDK that is built with iOS SDK v)(.*)/\1$appsflyerLibVersion./g" README.md sed -r -i '' "s/(.*pod \'segment-appsflyer-ios.*)([0-9]+\.[0-9]+\.[0-9]+)(.*)/\1$appsflyerLibVersion\3/g" README.md diff --git a/examples/SwiftPodsSample/SwiftPodsSample.xcodeproj/project.pbxproj b/examples/SwiftPodsSample/SwiftPodsSample.xcodeproj/project.pbxproj index 541e9e5..b32fde6 100644 --- a/examples/SwiftPodsSample/SwiftPodsSample.xcodeproj/project.pbxproj +++ b/examples/SwiftPodsSample/SwiftPodsSample.xcodeproj/project.pbxproj @@ -3,13 +3,12 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ 954064F38BF10350BB5B1DAC /* Pods_SwiftPodsSample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D615F2D019A120C8773288D /* Pods_SwiftPodsSample.framework */; }; 9D29F71F24E4081F007A929A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D29F71E24E4081F007A929A /* AppDelegate.swift */; }; - 9D29F72124E4081F007A929A /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D29F72024E4081F007A929A /* SceneDelegate.swift */; }; 9D29F72324E4081F007A929A /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D29F72224E4081F007A929A /* ViewController.swift */; }; 9D29F72624E4081F007A929A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9D29F72424E4081F007A929A /* Main.storyboard */; }; 9D29F72824E40820007A929A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9D29F72724E40820007A929A /* Assets.xcassets */; }; @@ -20,7 +19,6 @@ 2D615F2D019A120C8773288D /* Pods_SwiftPodsSample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SwiftPodsSample.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9D29F71B24E4081F007A929A /* SwiftPodsSample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SwiftPodsSample.app; sourceTree = BUILT_PRODUCTS_DIR; }; 9D29F71E24E4081F007A929A /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 9D29F72024E4081F007A929A /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; 9D29F72224E4081F007A929A /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; 9D29F72524E4081F007A929A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 9D29F72724E40820007A929A /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -28,6 +26,7 @@ 9D29F72C24E40820007A929A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 9D29F73324E40AE9007A929A /* SwiftPodsSample-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SwiftPodsSample-Bridging-Header.h"; sourceTree = ""; }; 9F10C505DB27305DDC0B3EDD /* Pods-SwiftPodsSample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwiftPodsSample.release.xcconfig"; path = "Target Support Files/Pods-SwiftPodsSample/Pods-SwiftPodsSample.release.xcconfig"; sourceTree = ""; }; + B3619ED32C74A6770067E195 /* SwiftPodsSample.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = SwiftPodsSample.entitlements; sourceTree = ""; }; D55B32FE162D54FD3F59944C /* Pods-SwiftPodsSample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwiftPodsSample.debug.xcconfig"; path = "Target Support Files/Pods-SwiftPodsSample/Pods-SwiftPodsSample.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -73,9 +72,9 @@ 9D29F71D24E4081F007A929A /* SwiftPodsSample */ = { isa = PBXGroup; children = ( + B3619ED32C74A6770067E195 /* SwiftPodsSample.entitlements */, 9D29F73324E40AE9007A929A /* SwiftPodsSample-Bridging-Header.h */, 9D29F71E24E4081F007A929A /* AppDelegate.swift */, - 9D29F72024E4081F007A929A /* SceneDelegate.swift */, 9D29F72224E4081F007A929A /* ViewController.swift */, 9D29F72424E4081F007A929A /* Main.storyboard */, 9D29F72724E40820007A929A /* Assets.xcassets */, @@ -105,6 +104,7 @@ 9D29F71824E4081F007A929A /* Frameworks */, 9D29F71924E4081F007A929A /* Resources */, F6332A18B9239844E271B4AD /* [CP] Embed Pods Frameworks */, + AE2D77C364B498651EBB1DB7 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -183,6 +183,23 @@ 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; }; + AE2D77C364B498651EBB1DB7 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-SwiftPodsSample/Pods-SwiftPodsSample-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-SwiftPodsSample/Pods-SwiftPodsSample-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-SwiftPodsSample/Pods-SwiftPodsSample-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; F6332A18B9239844E271B4AD /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -209,7 +226,6 @@ files = ( 9D29F72324E4081F007A929A /* ViewController.swift in Sources */, 9D29F71F24E4081F007A929A /* AppDelegate.swift in Sources */, - 9D29F72124E4081F007A929A /* SceneDelegate.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -357,6 +373,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_ENTITLEMENTS = SwiftPodsSample/SwiftPodsSample.entitlements; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = 6UQAD4B3U2; INFOPLIST_FILE = SwiftPodsSample/Info.plist; @@ -364,7 +381,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.appsflyer.SwiftPodsSample; + PRODUCT_BUNDLE_IDENTIFIER = com.appsflyer.SwiftPodsSampleMoris; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "SwiftPodsSample/SwiftPodsSample-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -378,6 +395,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_ENTITLEMENTS = SwiftPodsSample/SwiftPodsSample.entitlements; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = 6UQAD4B3U2; INFOPLIST_FILE = SwiftPodsSample/Info.plist; @@ -385,7 +403,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.appsflyer.SwiftPodsSample; + PRODUCT_BUNDLE_IDENTIFIER = com.appsflyer.SwiftPodsSampleMoris; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "SwiftPodsSample/SwiftPodsSample-Bridging-Header.h"; SWIFT_VERSION = 5.0; diff --git a/examples/SwiftPodsSample/SwiftPodsSample/AppDelegate.swift b/examples/SwiftPodsSample/SwiftPodsSample/AppDelegate.swift index f6baab7..a4c07ee 100644 --- a/examples/SwiftPodsSample/SwiftPodsSample/AppDelegate.swift +++ b/examples/SwiftPodsSample/SwiftPodsSample/AppDelegate.swift @@ -12,7 +12,7 @@ import AppTrackingTransparency @UIApplicationMain class AppDelegate: UIResponder, UIApplicationDelegate { - + var window: UIWindow? func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { // For AppsFLyer debug logs uncomment the line below @@ -51,24 +51,17 @@ class AppDelegate: UIResponder, UIApplicationDelegate { } } + // For Swift version < 4.2 replace function signature with the commented out code +// func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([Any]?) -> Void) -> Bool { // this line for Swift < 4.2 func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool { - AppsFlyerLib.shared().continue(userActivity, restorationHandler: nil) - return true - } - - func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([Any]?) -> Void) -> Bool { - AppsFlyerLib.shared().continue(userActivity, restorationHandler: restorationHandler) - return true + AppsFlyerLib.shared().continue(userActivity, restorationHandler: nil) + return true } - func application(_ application: UIApplication, open url: URL, sourceApplication: String?, annotation: Any) -> Bool { - AppsFlyerLib.shared().handleOpen(url, sourceApplication: sourceApplication, withAnnotation: annotation) - return true - } - + // Open URI-scheme for iOS 9 and above func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool { - AppsFlyerLib.shared().handleOpen(url, options: options) - return true + AppsFlyerLib.shared().handleOpen(url, options: options) + return true } } diff --git a/examples/SwiftPodsSample/SwiftPodsSample/Info.plist b/examples/SwiftPodsSample/SwiftPodsSample/Info.plist index 70cf759..b64a394 100644 --- a/examples/SwiftPodsSample/SwiftPodsSample/Info.plist +++ b/examples/SwiftPodsSample/SwiftPodsSample/Info.plist @@ -2,8 +2,6 @@ - NSUserTrackingUsageDescription - This will allow us to collect your IDFA CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleExecutable @@ -22,25 +20,8 @@ 1 LSRequiresIPhoneOS - UIApplicationSceneManifest - - UIApplicationSupportsMultipleScenes - - UISceneConfigurations - - UIWindowSceneSessionRoleApplication - - - UISceneConfigurationName - Default Configuration - UISceneDelegateClassName - $(PRODUCT_MODULE_NAME).SceneDelegate - UISceneStoryboardFile - Main - - - - + NSUserTrackingUsageDescription + This will allow us to collect your IDFA UIApplicationSupportsIndirectInputEvents UILaunchStoryboardName diff --git a/examples/SwiftPodsSample/SwiftPodsSample/SceneDelegate.swift b/examples/SwiftPodsSample/SwiftPodsSample/SceneDelegate.swift deleted file mode 100644 index 8aceee4..0000000 --- a/examples/SwiftPodsSample/SwiftPodsSample/SceneDelegate.swift +++ /dev/null @@ -1,52 +0,0 @@ -// -// SceneDelegate.swift -// SwiftPodsSample -// -// Created by Vitaly Sokolov on 12.08.2020. -// - -import UIKit - -class SceneDelegate: UIResponder, UIWindowSceneDelegate { - - var window: UIWindow? - - - func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { - // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`. - // If using a storyboard, the `window` property will automatically be initialized and attached to the scene. - // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead). - guard let _ = (scene as? UIWindowScene) else { return } - } - - func sceneDidDisconnect(_ scene: UIScene) { - // Called as the scene is being released by the system. - // This occurs shortly after the scene enters the background, or when its session is discarded. - // Release any resources associated with this scene that can be re-created the next time the scene connects. - // The scene may re-connect later, as its session was not necessarily discarded (see `application:didDiscardSceneSessions` instead). - } - - func sceneDidBecomeActive(_ scene: UIScene) { - // Called when the scene has moved from an inactive state to an active state. - // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive. - } - - func sceneWillResignActive(_ scene: UIScene) { - // Called when the scene will move from an active state to an inactive state. - // This may occur due to temporary interruptions (ex. an incoming phone call). - } - - func sceneWillEnterForeground(_ scene: UIScene) { - // Called as the scene transitions from the background to the foreground. - // Use this method to undo the changes made on entering the background. - } - - func sceneDidEnterBackground(_ scene: UIScene) { - // Called as the scene transitions from the foreground to the background. - // Use this method to save data, release shared resources, and store enough scene-specific state information - // to restore the scene back to its current state. - } - - -} - diff --git a/examples/SwiftPodsSample/SwiftPodsSample/SwiftPodsSample.entitlements b/examples/SwiftPodsSample/SwiftPodsSample/SwiftPodsSample.entitlements new file mode 100644 index 0000000..d239e89 --- /dev/null +++ b/examples/SwiftPodsSample/SwiftPodsSample/SwiftPodsSample.entitlements @@ -0,0 +1,10 @@ + + + + + com.apple.developer.associated-domains + + applinks:sample-app-for-segment.onelink.me + + + diff --git a/examples/SwiftPodsSample/SwiftPodsSample/ViewController.swift b/examples/SwiftPodsSample/SwiftPodsSample/ViewController.swift index 377ab1c..8405f11 100644 --- a/examples/SwiftPodsSample/SwiftPodsSample/ViewController.swift +++ b/examples/SwiftPodsSample/SwiftPodsSample/ViewController.swift @@ -19,6 +19,13 @@ class ViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() // Do any additional setup after loading the view. + //Looks for single or multiple taps. + let tap = UITapGestureRecognizer(target: self, action: #selector(UIInputViewController.dismissKeyboard)) + + //Uncomment the line below if you want the tap not not interfere and cancel other interactions. + //tap.cancelsTouchesInView = false + + view.addGestureRecognizer(tap) } //MARK:- IBActions @@ -36,5 +43,11 @@ class ViewController: UIViewController { } + //Calls this function when the tap is recognized. + @objc func dismissKeyboard() { + //Causes the view (or one of its embedded text fields) to resign the first responder status. + view.endEditing(true) + } + } diff --git a/segment-appsflyer-ios.xcodeproj/project.pbxproj b/segment-appsflyer-ios.xcodeproj/project.pbxproj index 3ee5cb2..000167a 100644 --- a/segment-appsflyer-ios.xcodeproj/project.pbxproj +++ b/segment-appsflyer-ios.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -12,11 +12,13 @@ 47A0A8F823D5CA7A00FE781F /* SegmentAppsFlyeriOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 47A0A8F323D5CA7A00FE781F /* SegmentAppsFlyeriOS.h */; settings = {ATTRIBUTES = (Public, ); }; }; 47A0A8F923D5CA7A00FE781F /* SEGAppsFlyerIntegration.h in Headers */ = {isa = PBXBuildFile; fileRef = 47A0A8F423D5CA7A00FE781F /* SEGAppsFlyerIntegration.h */; settings = {ATTRIBUTES = (Public, ); }; }; 47A0A8FA23D5CA7A00FE781F /* SEGAppsFlyerIntegrationFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 47A0A8F523D5CA7A00FE781F /* SEGAppsFlyerIntegrationFactory.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 532F5B68C04C9B7505074D3D /* Pods_SegmentAppsFlyeriOSTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C514E1E9C6226888E04C56C5 /* Pods_SegmentAppsFlyeriOSTests.framework */; }; 86F430F225B4369500BD66B9 /* AppsFlyerLib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47A0A8FD23D5CF8B00FE781F /* AppsFlyerLib.framework */; }; 86F430F525B4369600BD66B9 /* Segment.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 868810BD258FB606001F6545 /* Segment.framework */; }; A5201335295B1A5B00B87090 /* SEGAppsFlyerIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A5201334295B1A5B00B87090 /* SEGAppsFlyerIntegrationTests.m */; }; A52E9C84295B0478004EC3DF /* SEGAppsFlyerIntegrationFactoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A52E9C83295B0478004EC3DF /* SEGAppsFlyerIntegrationFactoryTests.swift */; }; A52E9C85295B0478004EC3DF /* SegmentAppsFlyeriOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47A0A8DA23D5B13500FE781F /* SegmentAppsFlyeriOS.framework */; }; + B3BC2B4E90E770C30670D879 /* Pods_segment_appsflyer_ios.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2251986739F57303C16AA90C /* Pods_segment_appsflyer_ios.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -30,6 +32,10 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 117E50BC57E8FE27F9E1C2BF /* Pods-SegmentAppsFlyeriOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SegmentAppsFlyeriOSTests.release.xcconfig"; path = "Target Support Files/Pods-SegmentAppsFlyeriOSTests/Pods-SegmentAppsFlyeriOSTests.release.xcconfig"; sourceTree = ""; }; + 14B1B6446A9CC81F261A8CDD /* Pods-segment-appsflyer-ios.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-segment-appsflyer-ios.debug.xcconfig"; path = "Target Support Files/Pods-segment-appsflyer-ios/Pods-segment-appsflyer-ios.debug.xcconfig"; sourceTree = ""; }; + 2016CB37383438EE71FC13C8 /* Pods-SegmentAppsFlyeriOSTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SegmentAppsFlyeriOSTests.debug.xcconfig"; path = "Target Support Files/Pods-SegmentAppsFlyeriOSTests/Pods-SegmentAppsFlyeriOSTests.debug.xcconfig"; sourceTree = ""; }; + 2251986739F57303C16AA90C /* Pods_segment_appsflyer_ios.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_segment_appsflyer_ios.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 47A0A8DA23D5B13500FE781F /* SegmentAppsFlyeriOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SegmentAppsFlyeriOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 47A0A8DE23D5B13500FE781F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 47A0A8F123D5CA7A00FE781F /* SEGAppsFlyerIntegration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SEGAppsFlyerIntegration.m; sourceTree = ""; }; @@ -45,6 +51,8 @@ A5201334295B1A5B00B87090 /* SEGAppsFlyerIntegrationTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SEGAppsFlyerIntegrationTests.m; sourceTree = ""; }; A52E9C81295B0478004EC3DF /* SegmentAppsFlyeriOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SegmentAppsFlyeriOSTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; A52E9C83295B0478004EC3DF /* SEGAppsFlyerIntegrationFactoryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SEGAppsFlyerIntegrationFactoryTests.swift; sourceTree = ""; }; + C514E1E9C6226888E04C56C5 /* Pods_SegmentAppsFlyeriOSTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SegmentAppsFlyeriOSTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + DF2C5E1ABF8F45D3BA890D46 /* Pods-segment-appsflyer-ios.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-segment-appsflyer-ios.release.xcconfig"; path = "Target Support Files/Pods-segment-appsflyer-ios/Pods-segment-appsflyer-ios.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -54,6 +62,7 @@ files = ( 86F430F525B4369600BD66B9 /* Segment.framework in Frameworks */, 86F430F225B4369500BD66B9 /* AppsFlyerLib.framework in Frameworks */, + B3BC2B4E90E770C30670D879 /* Pods_segment_appsflyer_ios.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -62,6 +71,7 @@ buildActionMask = 2147483647; files = ( A52E9C85295B0478004EC3DF /* SegmentAppsFlyeriOS.framework in Frameworks */, + 532F5B68C04C9B7505074D3D /* Pods_SegmentAppsFlyeriOSTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -116,6 +126,8 @@ 86881093258F9113001F6545 /* segment_appsflyer_ios.framework */, 47A0A8FC23D5CF8B00FE781F /* Analytics.framework */, 47A0A8FD23D5CF8B00FE781F /* AppsFlyerLib.framework */, + C514E1E9C6226888E04C56C5 /* Pods_SegmentAppsFlyeriOSTests.framework */, + 2251986739F57303C16AA90C /* Pods_segment_appsflyer_ios.framework */, ); name = Frameworks; sourceTree = ""; @@ -133,6 +145,10 @@ A7E5A8BDE3AE44B9A11797D8 /* Pods */ = { isa = PBXGroup; children = ( + 2016CB37383438EE71FC13C8 /* Pods-SegmentAppsFlyeriOSTests.debug.xcconfig */, + 117E50BC57E8FE27F9E1C2BF /* Pods-SegmentAppsFlyeriOSTests.release.xcconfig */, + 14B1B6446A9CC81F261A8CDD /* Pods-segment-appsflyer-ios.debug.xcconfig */, + DF2C5E1ABF8F45D3BA890D46 /* Pods-segment-appsflyer-ios.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -157,10 +173,12 @@ isa = PBXNativeTarget; buildConfigurationList = 47A0A8E223D5B13500FE781F /* Build configuration list for PBXNativeTarget "segment-appsflyer-ios" */; buildPhases = ( + 320D0B50869D6B4AC466C411 /* [CP] Check Pods Manifest.lock */, 47A0A8D523D5B13500FE781F /* Headers */, 47A0A8D623D5B13500FE781F /* Sources */, 47A0A8D723D5B13500FE781F /* Frameworks */, 47A0A8D823D5B13500FE781F /* Resources */, + 07C5D16CA9538BA91FEEC402 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -175,9 +193,12 @@ isa = PBXNativeTarget; buildConfigurationList = A52E9C8A295B0478004EC3DF /* Build configuration list for PBXNativeTarget "SegmentAppsFlyeriOSTests" */; buildPhases = ( + 956AAF3F7EA6B8B2ED039C44 /* [CP] Check Pods Manifest.lock */, A52E9C7D295B0478004EC3DF /* Sources */, A52E9C7E295B0478004EC3DF /* Frameworks */, A52E9C7F295B0478004EC3DF /* Resources */, + 8D7143CA5604001596A00707 /* [CP] Embed Pods Frameworks */, + 146EE4D0A647CC4492BFC8FB /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -244,6 +265,104 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + 07C5D16CA9538BA91FEEC402 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-segment-appsflyer-ios/Pods-segment-appsflyer-ios-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-segment-appsflyer-ios/Pods-segment-appsflyer-ios-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-segment-appsflyer-ios/Pods-segment-appsflyer-ios-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + 146EE4D0A647CC4492BFC8FB /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-SegmentAppsFlyeriOSTests/Pods-SegmentAppsFlyeriOSTests-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-SegmentAppsFlyeriOSTests/Pods-SegmentAppsFlyeriOSTests-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-SegmentAppsFlyeriOSTests/Pods-SegmentAppsFlyeriOSTests-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + 320D0B50869D6B4AC466C411 /* [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-segment-appsflyer-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; + }; + 8D7143CA5604001596A00707 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-SegmentAppsFlyeriOSTests/Pods-SegmentAppsFlyeriOSTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-SegmentAppsFlyeriOSTests/Pods-SegmentAppsFlyeriOSTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-SegmentAppsFlyeriOSTests/Pods-SegmentAppsFlyeriOSTests-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + 956AAF3F7EA6B8B2ED039C44 /* [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-SegmentAppsFlyeriOSTests-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; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ 47A0A8D623D5B13500FE781F /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -395,6 +514,7 @@ }; 47A0A8E323D5B13500FE781F /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 14B1B6446A9CC81F261A8CDD /* Pods-segment-appsflyer-ios.debug.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; @@ -422,12 +542,16 @@ PROVISIONING_PROFILE_SPECIFIER = ""; "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = YES; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; 47A0A8E423D5B13500FE781F /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = DF2C5E1ABF8F45D3BA890D46 /* Pods-segment-appsflyer-ios.release.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; @@ -455,12 +579,16 @@ PROVISIONING_PROFILE_SPECIFIER = ""; "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = YES; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; }; A52E9C88295B0478004EC3DF /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 2016CB37383438EE71FC13C8 /* Pods-SegmentAppsFlyeriOSTests.debug.xcconfig */; buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CLANG_ENABLE_MODULES = YES; @@ -477,6 +605,9 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.MorisGateno.SegmentAppsFlyeriOSTests; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = YES; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_OBJC_BRIDGING_HEADER = "SegmentAppsFlyeriOSTests/SegmentAppsFlyeriOSTests-Bridging-Header.h"; @@ -488,6 +619,7 @@ }; A52E9C89295B0478004EC3DF /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 117E50BC57E8FE27F9E1C2BF /* Pods-SegmentAppsFlyeriOSTests.release.xcconfig */; buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CLANG_ENABLE_MODULES = YES; @@ -504,6 +636,9 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = com.MorisGateno.SegmentAppsFlyeriOSTests; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = YES; + SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_OBJC_BRIDGING_HEADER = "SegmentAppsFlyeriOSTests/SegmentAppsFlyeriOSTests-Bridging-Header.h"; From d9a5a3000296bffa96b1ac148077211aa3fd6b73 Mon Sep 17 00:00:00 2001 From: Moris Gateno Date: Tue, 20 Aug 2024 14:02:21 +0300 Subject: [PATCH 33/34] Commited from github action - prepaing the repo for QA locally. --- Package.swift | 2 +- README.md | 6 +++--- examples/ObjcPodsSample/Podfile | 2 +- examples/SwiftPodsSample/Podfile | 2 +- releasenotes.6.15.1 | 0 ...ppsflyer-ios.podspec => segment-appsflyer-ios-qa.podspec | 6 +++--- segment-appsflyer-ios/Classes/SEGAppsFlyerIntegration.m | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 releasenotes.6.15.1 rename segment-appsflyer-ios.podspec => segment-appsflyer-ios-qa.podspec (92%) diff --git a/Package.swift b/Package.swift index 93605ce..0366936 100644 --- a/Package.swift +++ b/Package.swift @@ -17,7 +17,7 @@ let package = Package( dependencies: [ // Dependencies declare other packages that this package depends on. .package(name: "Segment", url: "https://github.com/segmentio/analytics-ios.git" , from: "4.0.0"), - .package(name: "AppsFlyerLib" , url: "https://github.com/AppsFlyerSDK/AppsFlyerFramework.git", .exact("6.14.3")), + .package(name: "AppsFlyerLib" , url: "https://github.com/AppsFlyerSDK/AppsFlyerFramework.git", .exact("6.15.1")), ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. diff --git a/README.md b/README.md index 21b637e..25c2a0c 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # AppsFlyer integration for Segment. -## This is a Segment wrapper for AppsFlyer SDK that is built with iOS SDK v6.14.3. +## This is a Segment wrapper for AppsFlyer SDK that is built with iOS SDK v6.15.1. [![Version](https://img.shields.io/badge/cocoapods-compatible-brightgreen?logo=cocoapods&logoColor=green&style=flat)](http://cocoapods.org/pods/segment-appsflyer-ios) [![Carthage compatible](https://img.shields.io/badge/Carthage-not_compatible-C20000.svg?style=flat)](https://github.com/Carthage/Carthage) @@ -49,12 +49,12 @@ To install the segment-appsflyer-ios integration: **Production** version: ```ruby -pod 'segment-appsflyer-ios', '6.14.3' +pod 'segment-appsflyer-ios', '6.15.1' ``` **Strict mode SDK** version: ```ruby -pod 'segment-appsflyer-ios/Strict', '6.14.3' +pod 'segment-appsflyer-ios/Strict', '6.15.1' ``` Use the strict mode SDK to completely remove IDFA collection functionality and AdSupport framework dependencies (for example, when developing apps for kids). diff --git a/examples/ObjcPodsSample/Podfile b/examples/ObjcPodsSample/Podfile index 81db05e..ec145cd 100644 --- a/examples/ObjcPodsSample/Podfile +++ b/examples/ObjcPodsSample/Podfile @@ -6,5 +6,5 @@ target 'ObjcPodsSample' do use_frameworks! # Pods for ObjcPodsSample - pod 'segment-appsflyer-ios','6.14.3' + pod 'segment-appsflyer-ios-qa','6.15.1-rc2' end diff --git a/examples/SwiftPodsSample/Podfile b/examples/SwiftPodsSample/Podfile index 6608823..4ae193e 100644 --- a/examples/SwiftPodsSample/Podfile +++ b/examples/SwiftPodsSample/Podfile @@ -6,6 +6,6 @@ target 'SwiftPodsSample' do use_frameworks! # Pods for SwiftPodsSample - pod 'segment-appsflyer-ios','6.14.3' + pod 'segment-appsflyer-ios-qa','6.15.1-rc2' end diff --git a/releasenotes.6.15.1 b/releasenotes.6.15.1 new file mode 100644 index 0000000..e69de29 diff --git a/segment-appsflyer-ios.podspec b/segment-appsflyer-ios-qa.podspec similarity index 92% rename from segment-appsflyer-ios.podspec rename to segment-appsflyer-ios-qa.podspec index dc8b80c..6a41e40 100644 --- a/segment-appsflyer-ios.podspec +++ b/segment-appsflyer-ios-qa.podspec @@ -1,8 +1,8 @@ -version_appsflyerLib = '6.14.3' -version_plugin = '6.14.3' +version_appsflyerLib = '6.15.1' +version_plugin = '6.15.1-rc2' Pod::Spec.new do |s| - s.name = "segment-appsflyer-ios" + s.name = "segment-appsflyer-ios-qa" s.version = version_plugin s.summary = "AppsFlyer Integration for Segment's analytics-ios library." diff --git a/segment-appsflyer-ios/Classes/SEGAppsFlyerIntegration.m b/segment-appsflyer-ios/Classes/SEGAppsFlyerIntegration.m index 304af66..e4725ed 100644 --- a/segment-appsflyer-ios/Classes/SEGAppsFlyerIntegration.m +++ b/segment-appsflyer-ios/Classes/SEGAppsFlyerIntegration.m @@ -35,7 +35,7 @@ - (instancetype)initWithSettings:(NSDictionary *)settings withAnalytics:(SEGAnal self.appsflyer = [self appsflyerLib]; [self.appsflyer setPluginInfoWith:AFSDKPluginSegment - pluginVersion:@"6.14.3" + pluginVersion:@"6.15.1" additionalParams:nil]; [self.appsflyer setAppsFlyerDevKey:afDevKey]; [self.appsflyer setAppleAppID:appleAppId]; @@ -93,7 +93,7 @@ - (instancetype)initWithSettings:(NSDictionary *)settings withAppsflyer:(AppsFly self.appsflyer = aAppsflyer; [self.appsflyer setPluginInfoWith:AFSDKPluginSegment - pluginVersion:@"6.14.3" + pluginVersion:@"6.15.1" additionalParams:nil]; NSString *afDevKey = [self.settings objectForKey:@"appsFlyerDevKey"]; From d2c204744b88749148e1ebc5c4a3c6cb2c04cb65 Mon Sep 17 00:00:00 2001 From: Anka Date: Tue, 20 Aug 2024 11:06:13 +0000 Subject: [PATCH 34/34] Commited from github action - prepaing the repo for production. --- RELEASENOTES.md | 3 +++ examples/ObjcPodsSample/Podfile | 2 +- examples/SwiftPodsSample/Podfile | 2 +- releasenotes.6.15.1 | 0 ...-appsflyer-ios-qa.podspec => segment-appsflyer-ios.podspec | 4 ++-- 5 files changed, 7 insertions(+), 4 deletions(-) delete mode 100644 releasenotes.6.15.1 rename segment-appsflyer-ios-qa.podspec => segment-appsflyer-ios.podspec (94%) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 723b53c..f316c15 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,3 +1,6 @@ +### 6.15.1 + + ### 6.14.3 * Update to Appsflyer SDK 6.14.3. diff --git a/examples/ObjcPodsSample/Podfile b/examples/ObjcPodsSample/Podfile index ec145cd..6f14bf5 100644 --- a/examples/ObjcPodsSample/Podfile +++ b/examples/ObjcPodsSample/Podfile @@ -6,5 +6,5 @@ target 'ObjcPodsSample' do use_frameworks! # Pods for ObjcPodsSample - pod 'segment-appsflyer-ios-qa','6.15.1-rc2' + pod 'segment-appsflyer-ios','6.15.1' end diff --git a/examples/SwiftPodsSample/Podfile b/examples/SwiftPodsSample/Podfile index 4ae193e..b936709 100644 --- a/examples/SwiftPodsSample/Podfile +++ b/examples/SwiftPodsSample/Podfile @@ -6,6 +6,6 @@ target 'SwiftPodsSample' do use_frameworks! # Pods for SwiftPodsSample - pod 'segment-appsflyer-ios-qa','6.15.1-rc2' + pod 'segment-appsflyer-ios','6.15.1' end diff --git a/releasenotes.6.15.1 b/releasenotes.6.15.1 deleted file mode 100644 index e69de29..0000000 diff --git a/segment-appsflyer-ios-qa.podspec b/segment-appsflyer-ios.podspec similarity index 94% rename from segment-appsflyer-ios-qa.podspec rename to segment-appsflyer-ios.podspec index 6a41e40..3179138 100644 --- a/segment-appsflyer-ios-qa.podspec +++ b/segment-appsflyer-ios.podspec @@ -1,8 +1,8 @@ version_appsflyerLib = '6.15.1' -version_plugin = '6.15.1-rc2' +version_plugin = '6.15.1' Pod::Spec.new do |s| - s.name = "segment-appsflyer-ios-qa" + s.name = "segment-appsflyer-ios" s.version = version_plugin s.summary = "AppsFlyer Integration for Segment's analytics-ios library."