From 3d1d5ac7533c82e91f02c484f21a7c4be50e9230 Mon Sep 17 00:00:00 2001 From: Yansong Yang Date: Tue, 19 Jan 2021 15:25:46 -0600 Subject: [PATCH] Bump up version -> 3.0.0 (#516) * Add release action to AEPCore repo; bump up version to 3.0.0-beta3 * update all podspec files: always depends on latests (to-be-released) AEPCore/AEPRulesEngine/AEPService * Update README.md * Update README.md * bump up version -> 3.0.0 * update podspec * update versions in Xcode --- .github/workflows/release.yml | 6 ++-- AEPCore.podspec | 6 ++-- AEPCore.xcodeproj/project.pbxproj | 31 +++++++++---------- .../ConfigurationConstants.swift | 2 +- AEPCore/Sources/core/CoreConstants.swift | 2 +- .../Sources/eventhub/EventHubConstants.swift | 2 +- AEPCore/Tests/MobileCoreTests.swift | 4 +-- AEPIdentity.podspec | 4 +-- AEPIdentity/Sources/IdentityConstants.swift | 2 +- AEPLifecycle.podspec | 4 +-- AEPLifecycle/Sources/LifecycleConstants.swift | 2 +- AEPServices.podspec | 2 +- AEPSignal.podspec | 4 +-- AEPSignal/Sources/SignalConstants.swift | 2 +- Makefile | 8 ++--- Script/test-podspec.sh | 1 - 16 files changed, 41 insertions(+), 41 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 625d18870..1677b7c64 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -58,6 +58,10 @@ jobs: set -eo pipefail echo Target version: ${{ github.event.inputs.tag }} make check-version VERSION=${{ github.event.inputs.tag }} + + - name: Pod repo update + run: | + pod repo update - name: SPM integration test if: ${{ github.event.inputs.action_tag == 'yes' }} @@ -83,8 +87,6 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # pod lib lint AEPServices.podspec --allow-warnings --swift-version=5.1 - - name: Publish Pods - AEPServices if: ${{ github.event.inputs.release_AEPServices == 'yes' }} run: | diff --git a/AEPCore.podspec b/AEPCore.podspec index 01e1f69a7..ce2d733a8 100644 --- a/AEPCore.podspec +++ b/AEPCore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "AEPCore" - s.version = "3.0.0-beta.3" + s.version = "3.0.0" s.summary = "Core library for Adobe Experience Platform Mobile SDK. Written and maintained by Adobe." s.description = <<-DESC The core library provides the foundation for the Adobe Experience Platform SDK. Having the core library installed is a pre-requisite for any other Adobe Experience Platform SDK extension to work. @@ -16,8 +16,8 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' } - s.dependency 'AEPRulesEngine', '1.0.0-beta.2' - s.dependency 'AEPServices', '3.0.0-beta.3' + s.dependency 'AEPRulesEngine', '1.0.0' + s.dependency 'AEPServices', '3.0.0' s.source_files = 'AEPCore/Sources/**/*.swift' diff --git a/AEPCore.xcodeproj/project.pbxproj b/AEPCore.xcodeproj/project.pbxproj index 13deb6097..19223c612 100644 --- a/AEPCore.xcodeproj/project.pbxproj +++ b/AEPCore.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 51; objects = { /* Begin PBXAggregateTarget section */ @@ -1758,7 +1758,6 @@ FD2BBB064817CE46D9576F84 /* Pods-AEPLifecycleTests.debug.xcconfig */, 9AD1C8FAF7E8C192A4441902 /* Pods-AEPLifecycleTests.release.xcconfig */, ); - name = Pods; path = Pods; sourceTree = ""; }; @@ -3326,7 +3325,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 3.0.0.beta.2; + MARKETING_VERSION = 3.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.core; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -3356,7 +3355,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 3.0.0.beta.2; + MARKETING_VERSION = 3.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.core; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -3430,7 +3429,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 3.0.0.beta.2; + MARKETING_VERSION = 3.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.signal; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -3458,7 +3457,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 3.0.0.beta.2; + MARKETING_VERSION = 3.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.signal; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -3525,7 +3524,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 3.0.0.beta.2; + MARKETING_VERSION = 3.0.0; PRODUCT_BUNDLE_IDENTIFIER = come.adobe.aep.services; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -3552,7 +3551,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 3.0.0.beta.2; + MARKETING_VERSION = 3.0.0; PRODUCT_BUNDLE_IDENTIFIER = come.adobe.aep.services; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -3672,7 +3671,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 3.0.0.beta.2; + MARKETING_VERSION = 3.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.AEPServicesMocks; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -3699,7 +3698,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 3.0.0.beta.2; + MARKETING_VERSION = 3.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.AEPServicesMocks; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -3725,7 +3724,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 3.0.0.beta.2; + MARKETING_VERSION = 3.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.lifecycle; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -3752,7 +3751,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 3.0.0.beta.2; + MARKETING_VERSION = 3.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.lifecycle; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -3821,7 +3820,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 3.0.0.beta.2; + MARKETING_VERSION = 3.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.identity; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -3848,7 +3847,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 3.0.0.beta.2; + MARKETING_VERSION = 3.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.identity; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -3917,7 +3916,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 3.0.0.beta.2; + MARKETING_VERSION = 3.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.AEPCoreMocks; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -3944,7 +3943,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 3.0.0.beta.2; + MARKETING_VERSION = 3.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.adobe.aep.AEPCoreMocks; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; diff --git a/AEPCore/Sources/configuration/ConfigurationConstants.swift b/AEPCore/Sources/configuration/ConfigurationConstants.swift index 65135676a..ab65b8824 100644 --- a/AEPCore/Sources/configuration/ConfigurationConstants.swift +++ b/AEPCore/Sources/configuration/ConfigurationConstants.swift @@ -15,7 +15,7 @@ import Foundation struct ConfigurationConstants { static let EXTENSION_NAME = "com.adobe.module.configuration" static let FRIENDLY_NAME = "Configuration" - static let EXTENSION_VERSION = "3.0.0-beta.3" + static let EXTENSION_VERSION = "3.0.0" static let DATA_STORE_NAME = EXTENSION_NAME static let CONFIG_URL_BASE = "https://assets.adobedtm.com/" diff --git a/AEPCore/Sources/core/CoreConstants.swift b/AEPCore/Sources/core/CoreConstants.swift index e28b88c46..78698445b 100644 --- a/AEPCore/Sources/core/CoreConstants.swift +++ b/AEPCore/Sources/core/CoreConstants.swift @@ -13,7 +13,7 @@ import Foundation enum CoreConstants { static let EXTENSION_NAME = "com.adobe.module.configuration" - static let EXTENSION_VERSION = "3.0.0-beta.3" + static let EXTENSION_VERSION = "3.0.0" static let DATA_STORE_NAME = EXTENSION_NAME static let CONFIG_URL_BASE = "https://assets.adobedtm.com/" diff --git a/AEPCore/Sources/eventhub/EventHubConstants.swift b/AEPCore/Sources/eventhub/EventHubConstants.swift index 087165faf..5049e90b9 100644 --- a/AEPCore/Sources/eventhub/EventHubConstants.swift +++ b/AEPCore/Sources/eventhub/EventHubConstants.swift @@ -16,7 +16,7 @@ enum EventHubConstants { static let STATE_CHANGE = "STATE_CHANGE_EVENT" static let NAME = "com.adobe.module.eventhub" static let FRIENDLY_NAME = "EventHub" - static let VERSION_NUMBER = "3.0.0-beta.3" + static let VERSION_NUMBER = "3.0.0" enum EventDataKeys { static let VERSION = "version" diff --git a/AEPCore/Tests/MobileCoreTests.swift b/AEPCore/Tests/MobileCoreTests.swift index 843aa8e0e..a859427e6 100644 --- a/AEPCore/Tests/MobileCoreTests.swift +++ b/AEPCore/Tests/MobileCoreTests.swift @@ -192,7 +192,7 @@ class MobileCoreTests: XCTestCase { "version" : "0.0.1" }, "Configuration" : { - "version" : "3.0.0-beta.3" + "version" : "3.0.0" }, "mockExtensionTwo" : { "metadata" : { @@ -201,7 +201,7 @@ class MobileCoreTests: XCTestCase { "version" : "0.0.1" } }, - "version" : "3.0.0-beta.3" + "version" : "3.0.0" } """ let expectedDict = jsonStrToDict(jsonStr: expected) diff --git a/AEPIdentity.podspec b/AEPIdentity.podspec index 93dedccfc..2970251a6 100644 --- a/AEPIdentity.podspec +++ b/AEPIdentity.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "AEPIdentity" - s.version = "3.0.0-beta.3" + s.version = "3.0.0" s.summary = "Identity extension for Adobe Experience Platform Mobile SDK. Written and maintained by Adobe." s.description = <<-DESC The AEPIdentity extension provides APIs that allow use of the Visitor ID services in the Adobe Experience Cloud SDK. @@ -17,6 +17,6 @@ Pod::Spec.new do |s| s.swift_version = '5.1' s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' } - s.dependency 'AEPCore', '3.0.0-beta.3' + s.dependency 'AEPCore', '3.0.0' end diff --git a/AEPIdentity/Sources/IdentityConstants.swift b/AEPIdentity/Sources/IdentityConstants.swift index 68f55d68d..52907cc0b 100644 --- a/AEPIdentity/Sources/IdentityConstants.swift +++ b/AEPIdentity/Sources/IdentityConstants.swift @@ -14,7 +14,7 @@ import Foundation enum IdentityConstants { static let EXTENSION_NAME = "com.adobe.module.identity" static let FRIENDLY_NAME = "Identity" - static let EXTENSION_VERSION = "3.0.0-beta.3" + static let EXTENSION_VERSION = "3.0.0" static let DATASTORE_NAME = EXTENSION_NAME static let API_TIMEOUT = TimeInterval(0.5) // Get API requests timeout after half a second diff --git a/AEPLifecycle.podspec b/AEPLifecycle.podspec index 732b6d0bd..86de2fdf8 100644 --- a/AEPLifecycle.podspec +++ b/AEPLifecycle.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "AEPLifecycle" - s.version = "3.0.0-beta.3" + s.version = "3.0.0" s.summary = "Lifecycle extension for Adobe Experience Platform Mobile SDK. Written and maintained by Adobe." s.description = <<-DESC The AEPLifecycle extension is used to track application lifecycle including session metricss and device related data. @@ -17,5 +17,5 @@ Pod::Spec.new do |s| s.swift_version = '5.1' s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' } - s.dependency 'AEPCore', '3.0.0-beta.3' + s.dependency 'AEPCore', '3.0.0' end diff --git a/AEPLifecycle/Sources/LifecycleConstants.swift b/AEPLifecycle/Sources/LifecycleConstants.swift index 4550e83ba..51ff8a6aa 100644 --- a/AEPLifecycle/Sources/LifecycleConstants.swift +++ b/AEPLifecycle/Sources/LifecycleConstants.swift @@ -15,7 +15,7 @@ import Foundation enum LifecycleConstants { static let EXTENSION_NAME = "com.adobe.module.lifecycle" static let FRIENDLY_NAME = "Lifecycle" - static let EXTENSION_VERSION = "3.0.0-beta.3" + static let EXTENSION_VERSION = "3.0.0" static let DATA_STORE_NAME = LifecycleConstants.EXTENSION_NAME static let START = "start" diff --git a/AEPServices.podspec b/AEPServices.podspec index c2d594282..95ce9a6a6 100644 --- a/AEPServices.podspec +++ b/AEPServices.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "AEPServices" - s.version = "3.0.0-beta.3" + s.version = "3.0.0" s.summary = "Servcies library for Adobe Experience Platform Mobile SDK. Written and maintained by Adobe." s.description = <<-DESC The AEPServices library provides the platform services and utilities for the Adobe Experience Platform SDK. Having the services library installed is a pre-requisite for any other Adobe Experience Platform SDK extension to work. diff --git a/AEPSignal.podspec b/AEPSignal.podspec index 1f7b232b6..add78a6c0 100644 --- a/AEPSignal.podspec +++ b/AEPSignal.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "AEPSignal" - s.version = "3.0.0-beta.3" + s.version = "3.0.0" s.summary = "Signal extension for Adobe Experience Platform Mobile SDK. Written and maintained by Adobe." s.description = <<-DESC The AEPSignal extension provides the support for Postback/PII/Open URL actions triggered by Core rules engine. @@ -17,6 +17,6 @@ Pod::Spec.new do |s| s.swift_version = '5.1' s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' } - s.dependency 'AEPCore', '3.0.0-beta.3' + s.dependency 'AEPCore', '3.0.0' end diff --git a/AEPSignal/Sources/SignalConstants.swift b/AEPSignal/Sources/SignalConstants.swift index 78c7e552c..a592dc41a 100644 --- a/AEPSignal/Sources/SignalConstants.swift +++ b/AEPSignal/Sources/SignalConstants.swift @@ -15,7 +15,7 @@ import Foundation enum SignalConstants { static let EXTENSION_NAME = "com.adobe.module.signal" static let FRIENDLY_NAME = "Signal" - static let EXTENSION_VERSION = "3.0.0-beta.3" + static let EXTENSION_VERSION = "3.0.0" static let DATASTORE_NAME = EXTENSION_NAME static let LOG_PREFIX = FRIENDLY_NAME diff --git a/Makefile b/Makefile index 5f71e3540..dc6f849ed 100644 --- a/Makefile +++ b/Makefile @@ -119,15 +119,15 @@ version-source-code: (echo "AEPLifecycle - ${BLUE}$(shell cat ./AEPLifecycle/Sources/LifecycleConstants.swift | egrep '\s*EXTENSION_VERSION\s*=\s*\"(.*)\"' | ruby -e "puts gets.scan(/\"(.*)\"/)[0] " | tr -d '"')${NC}") (echo "AEPSignal - ${BLUE}$(shell cat ./AEPSignal/Sources/SignalConstants.swift | egrep '\s*EXTENSION_VERSION\s*=\s*\"(.*)\"' | ruby -e "puts gets.scan(/\"(.*)\"/)[0] " | tr -d '"')${NC}") -# make check-version VERSION=3.0.0-beta.3 +# make check-version VERSION=3.0.0 check-version: - (sh ./script/version.sh $(VERSION)) + (sh ./Script/version.sh $(VERSION)) test-SPM-integration: - (sh ./script/test-SPM.sh) + (sh ./Script/test-SPM.sh) test-podspec: - (sh ./script/test-podspec.sh) + (sh ./Script/test-podspec.sh) pod-lint: (pod lib lint --allow-warnings --verbose --swift-version=5.1) \ No newline at end of file diff --git a/Script/test-podspec.sh b/Script/test-podspec.sh index c7cf73825..8a3bb12ce 100644 --- a/Script/test-podspec.sh +++ b/Script/test-podspec.sh @@ -23,7 +23,6 @@ target '$PROJECT_NAME' do pod 'AEPLifecycle', :path => '../AEPLifecycle.podspec' pod 'AEPServices', :path => '../AEPServices.podspec' pod 'AEPSignal', :path => '../AEPSignal.podspec' - pod 'AEPRulesEngine', '1.0.0-beta.2' end " >>Podfile