Skip to content

Commit

Permalink
Bump up version -> 3.0.0 (#516)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
yangyansong-adbe authored Jan 19, 2021
1 parent ed4ac0b commit 3d1d5ac
Show file tree
Hide file tree
Showing 16 changed files with 41 additions and 41 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
Expand All @@ -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: |
Expand Down
6 changes: 3 additions & 3 deletions AEPCore.podspec
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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'

Expand Down
31 changes: 15 additions & 16 deletions AEPCore.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objectVersion = 51;
objects = {

/* Begin PBXAggregateTarget section */
Expand Down Expand Up @@ -1758,7 +1758,6 @@
FD2BBB064817CE46D9576F84 /* Pods-AEPLifecycleTests.debug.xcconfig */,
9AD1C8FAF7E8C192A4441902 /* Pods-AEPLifecycleTests.release.xcconfig */,
);
name = Pods;
path = Pods;
sourceTree = "<group>";
};
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion AEPCore/Sources/configuration/ConfigurationConstants.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down
2 changes: 1 addition & 1 deletion AEPCore/Sources/core/CoreConstants.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down
2 changes: 1 addition & 1 deletion AEPCore/Sources/eventhub/EventHubConstants.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions AEPCore/Tests/MobileCoreTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ class MobileCoreTests: XCTestCase {
"version" : "0.0.1"
},
"Configuration" : {
"version" : "3.0.0-beta.3"
"version" : "3.0.0"
},
"mockExtensionTwo" : {
"metadata" : {
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions AEPIdentity.podspec
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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
2 changes: 1 addition & 1 deletion AEPIdentity/Sources/IdentityConstants.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions AEPLifecycle.podspec
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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
2 changes: 1 addition & 1 deletion AEPLifecycle/Sources/LifecycleConstants.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion AEPServices.podspec
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions AEPSignal.podspec
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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
2 changes: 1 addition & 1 deletion AEPSignal/Sources/SignalConstants.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
1 change: 0 additions & 1 deletion Script/test-podspec.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 3d1d5ac

Please sign in to comment.