From 7fccab83f665ebe00da09e55716b36f3a8e02798 Mon Sep 17 00:00:00 2001 From: Swarna Saraf Date: Fri, 27 May 2022 12:20:49 -0700 Subject: [PATCH] Release prep v1.0.0 (#46) * Release prep v1.0.0 * Code cleanup --- .circleci/config.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- AEPOptimize.podspec | 2 +- AEPOptimize.xcodeproj/project.pbxproj | 2 ++ Documentation/PUBLIC_APIs.md | 6 ++++++ Makefile | 4 ++-- README.md | 8 ++------ TestApps/AEPOptimizeDemoSwiftUI/SettingsView.swift | 4 ---- Tests/AEPOptimizeTests/UnitTests/OfferTests.swift | 1 - 9 files changed, 17 insertions(+), 18 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e6d7a16..659ff56 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -86,12 +86,12 @@ jobs: shasum -a $i -c --ignore-missing <(curl -s "https://raw.githubusercontent.com/codecov/codecov-bash/${VERSION}/SHA${i}SUM") || shasum -a $i -c <(curl -s "https://raw.githubusercontent.com/codecov/codecov-bash/${VERSION}/SHA${i}SUM" | grep -w "codecov") done - bash ./codecov -v -X s3 -c -D "./build/out" -J "AEPOptimize" -t ${CODECOV_TOKEN} + bash ./codecov -v -X s3 -c -D "./build/out" -J "AEPOptimize" # verify XCFramework archive builds - run: name: Build XCFramework command: | - if [ "${CIRCLE_BRANCH}" == "main" ]; then + if [ "${CIRCLE_BRANCH}" == "main" || "${CIRCLE_BRANCH}" == "staging" ]; then make archive fi \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2dba86d..37870ee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,12 +15,12 @@ on: default: 'yes' release_AEPOptimize: - description: 'release AEPOptimize Pod? ("no" to skip)' + description: 'release AEPOptimize to CocoaPods? ("no" to skip)' required: true default: 'yes' jobs: - release_optimize: + release_AEPOptimize: runs-on: macos-latest steps: - uses: actions/checkout@v2 diff --git a/AEPOptimize.podspec b/AEPOptimize.podspec index eef3efb..6af7fa9 100644 --- a/AEPOptimize.podspec +++ b/AEPOptimize.podspec @@ -3,7 +3,7 @@ Pod::Spec.new do |s| s.version = "1.0.0" s.summary = "Experience Platform Optimize extension for Adobe Experience Platform Mobile SDK. Written and maintained by Adobe." s.description = <<-DESC - The Experience Platform Optimize extension provides APIs to enable real-time personalization workflows in Adobe Experience Platform SDKs using the Edge decisioning services. + The Experience Platform Optimize extension provides APIs to enable real-time personalization workflows in the Adobe Experience Platform SDKs using Adobe Target or Adobe Journey Optimizer Offer Decisioning. DESC s.homepage = "https://github.com/adobe/aepsdk-optimize-ios" s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" } diff --git a/AEPOptimize.xcodeproj/project.pbxproj b/AEPOptimize.xcodeproj/project.pbxproj index 8dea9f3..3f28241 100644 --- a/AEPOptimize.xcodeproj/project.pbxproj +++ b/AEPOptimize.xcodeproj/project.pbxproj @@ -1357,6 +1357,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 10.0; + MARKETING_VERSION = 1.0.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -1415,6 +1416,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 10.0; + MARKETING_VERSION = 1.0.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; diff --git a/Documentation/PUBLIC_APIs.md b/Documentation/PUBLIC_APIs.md index f034bd5..e671c22 100644 --- a/Documentation/PUBLIC_APIs.md +++ b/Documentation/PUBLIC_APIs.md @@ -423,9 +423,15 @@ public class Offer: NSObject, Codable { /// Offer revision detail at the time of the request @objc public let etag: String + /// Offer priority score + @objc public let score: Int + /// Offer schema string @objc public let schema: String + /// Offer metadata + @objc public let meta: [String: Any]? + /// Offer type as represented in enum `OfferType` @objc public let type: OfferType diff --git a/Makefile b/Makefile index e9012c6..4238544 100644 --- a/Makefile +++ b/Makefile @@ -4,9 +4,9 @@ TARGET_NAME_XCFRAMEWORK = $(EXTENSION_NAME).xcframework SCHEME_NAME_XCFRAMEWORK = AEPOptimize CURR_DIR := ${CURDIR} -SIMULATOR_ARCHIVE_PATH = ./build/ios_simulator.xcarchive/Products/Library/Frameworks/ +SIMULATOR_ARCHIVE_PATH = $(CURR_DIR)/build/ios_simulator.xcarchive/Products/Library/Frameworks/ SIMULATOR_ARCHIVE_DSYM_PATH = $(CURR_DIR)/build/ios_simulator.xcarchive/dSYMs/ -IOS_ARCHIVE_PATH = ./build/ios.xcarchive/Products/Library/Frameworks/ +IOS_ARCHIVE_PATH = $(CURR_DIR)/build/ios.xcarchive/Products/Library/Frameworks/ IOS_ARCHIVE_DSYM_PATH = $(CURR_DIR)/build/ios.xcarchive/dSYMs/ lint-autocorrect: diff --git a/README.md b/README.md index 4354699..d84d026 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,8 @@ -# Adobe Experience Platform Optimize Mobile SDK (Beta) - -## Beta version acknowledgment - -By using the AEPOptimize SDK (“Beta”), you hereby acknowledge that the Beta is provided “as is” without warranty of any kind. Adobe shall have no obligation to maintain, correct, update, change, modify or otherwise support the Beta. You are advised to use caution and not to rely in any way on the correct functioning or performance of such Beta and/or accompanying materials. +# Adobe Experience Platform Optimize Mobile SDK ## About this project -The AEP Mobile Optimize SDK Extension provides APIs to enable real-time personalization workflows in Adobe Experience Platform SDKs using the Edge decisioning services. It depends on AEPCore and requires AEPEdge Extension to send personalization query Events to the Experience Edge network. +The AEPOptimize mobile SDK extension provides APIs to enable real-time personalization workflows in the Adobe Experience Platform SDKs using Adobe Target or Adobe Journey Optimizer Offer Decisioning. It depends on AEPCore and requires AEPEdge Extension to send personalization query events to the Experience Edge network. ## Requirements diff --git a/TestApps/AEPOptimizeDemoSwiftUI/SettingsView.swift b/TestApps/AEPOptimizeDemoSwiftUI/SettingsView.swift index 671a7ac..0fb5fc3 100644 --- a/TestApps/AEPOptimizeDemoSwiftUI/SettingsView.swift +++ b/TestApps/AEPOptimizeDemoSwiftUI/SettingsView.swift @@ -16,7 +16,6 @@ import AEPOptimize import SwiftUI struct SettingsView: View { - @State private var appId = "" @State private var assuranceSessionURL = "" @EnvironmentObject var odeSettings: OdeSettings @@ -29,9 +28,6 @@ struct SettingsView: View { VStack { HeaderView(text: "Settings") Form { - Section(header: Text("Launch Environment File ID")) { - TextField("Enter your appId", text: $appId) - } Section(header: Text("AEP Assurance Start URL")) { TextField("Enter Assurance start URL", text: $assuranceSessionURL) .onChange(of: assuranceSessionURL) { diff --git a/Tests/AEPOptimizeTests/UnitTests/OfferTests.swift b/Tests/AEPOptimizeTests/UnitTests/OfferTests.swift index e39f35f..88102cd 100644 --- a/Tests/AEPOptimizeTests/UnitTests/OfferTests.swift +++ b/Tests/AEPOptimizeTests/UnitTests/OfferTests.swift @@ -95,7 +95,6 @@ class OfferTests: XCTestCase { } """ - // PDCL-4528 & PDCL-4703 private let TARGET_OFFER = """ {\