Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Major version 5.0.0 release bump #981

Merged
merged 13 commits into from
Feb 5, 2024
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 35 additions & 19 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,28 +56,44 @@ workflows:
commands:
install_dependencies:
steps:
# restore pods related caches
- restore_cache:
keys:
- 1-gems-{{ checksum "Gemfile.lock" }}

# make sure we're on the right version of cocoapods
- run:
name: Verify Cocoapods Version
command: bundle check || bundle install --path vendor/bundle

# save cocoapods version gem data
- save_cache:
key: 1-gems-{{ checksum "Gemfile.lock" }}
paths:
- vendor/bundle

- run:
name: Pod install
command: pod install
command: make ci-pod-install

prestart_ios_simulator:
steps:
- macos/preboot-simulator:
platform: "iOS"
version: "16.1"
device: "iPhone 14"
version: "17.0"
device: "iPhone 15"

prestart_tvos_simulator:
steps:
- macos/preboot-simulator:
platform: "tvOS"
version: "16.1"
version: "17.0"
device: "Apple TV"

jobs:
validate-code:
macos:
xcode: 14.1.0 # Specify the Xcode version to use
xcode: 15.0.0 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -90,7 +106,7 @@ jobs:

test-ios-core:
macos:
xcode: 14.1.0 # Specify the Xcode version to use
xcode: 15.0.0 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -112,7 +128,7 @@ jobs:

test-ios-services:
macos:
xcode: 14.1.0 # Specify the Xcode version to use
xcode: 15.0.0 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -134,7 +150,7 @@ jobs:

test-ios-lifecycle:
macos:
xcode: 14.1.0 # Specify the Xcode version to use
xcode: 15.0.0 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -156,7 +172,7 @@ jobs:

test-ios-identity:
macos:
xcode: 14.1.0 # Specify the Xcode version to use
xcode: 15.0.0 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -178,7 +194,7 @@ jobs:

test-ios-signal:
macos:
xcode: 14.1.0 # Specify the Xcode version to use
xcode: 15.0.0 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -200,7 +216,7 @@ jobs:

test-ios-integration:
macos:
xcode: 14.1.0 # Specify the Xcode version to use
xcode: 15.0.0 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -215,7 +231,7 @@ jobs:

test-tvos-core:
macos:
xcode: 14.1.0 # Specify the Xcode version to use
xcode: 15.0.0 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -237,7 +253,7 @@ jobs:

test-tvos-services:
macos:
xcode: 14.1.0 # Specify the Xcode version to use
xcode: 15.0.0 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -259,7 +275,7 @@ jobs:

test-tvos-lifecycle:
macos:
xcode: 14.1.0 # Specify the Xcode version to use
xcode: 15.0.0 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -281,7 +297,7 @@ jobs:

test-tvos-identity:
macos:
xcode: 14.1.0 # Specify the Xcode version to use
xcode: 15.0.0 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -303,7 +319,7 @@ jobs:

test-tvos-signal:
macos:
xcode: 14.1.0 # Specify the Xcode version to use
xcode: 15.0.0 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -325,7 +341,7 @@ jobs:

test-tvos-integration:
macos:
xcode: 14.1.0 # Specify the Xcode version to use
xcode: 15.0.0 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -340,7 +356,7 @@ jobs:

test-spm-podspec-archive:
macos:
xcode: 14.1.0 # Specify the Xcode version to use
xcode: 15.0.0 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -349,7 +365,7 @@ jobs:
name: Build XCFramework
command: |
if [ "${CIRCLE_BRANCH}" == "main" ]; then
make archive
make ci-archive
fi
# verify podspec is valid
- run:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ on:

jobs:
release_core_bundle:
runs-on: macos-latest
runs-on: macos-13
praveek marked this conversation as resolved.
Show resolved Hide resolved
steps:
- uses: actions/checkout@v2
with:
ref: main
- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '14.1'
xcode-version: '15.0'

- name: Install jq
run: brew install jq
Expand Down Expand Up @@ -180,7 +180,7 @@ jobs:
if: ${{ github.event.inputs.release_AEPServices == 'yes' }}
run: |
set -eo pipefail
pod trunk push AEPServices.podspec --allow-warnings --synchronous --swift-version=5.1
pod trunk push AEPServices.podspec --allow-warnings --synchronous
pod repo update
env:
COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
Expand All @@ -189,7 +189,7 @@ jobs:
if: ${{ github.event.inputs.release_AEPCore == 'yes' }}
run: |
set -eo pipefail
pod trunk push AEPCore.podspec --allow-warnings --synchronous --swift-version=5.1
pod trunk push AEPCore.podspec --allow-warnings --synchronous
pod repo update
env:
COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
Expand All @@ -198,23 +198,23 @@ jobs:
if: ${{ github.event.inputs.release_AEPIdentity == 'yes' }}
run: |
set -eo pipefail
pod trunk push AEPIdentity.podspec --allow-warnings --synchronous --swift-version=5.1
pod trunk push AEPIdentity.podspec --allow-warnings --synchronous
env:
COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}

- name: Publish Pods - AEPLifecycle
if: ${{ github.event.inputs.release_AEPLifecycle == 'yes' }}
run: |
set -eo pipefail
pod trunk push AEPLifecycle.podspec --allow-warnings --synchronous --swift-version=5.1
pod trunk push AEPLifecycle.podspec --allow-warnings --synchronous
env:
COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}

- name: Publish Pods - AEPSignal
if: ${{ github.event.inputs.release_AEPSignal == 'yes' }}
run: |
set -eo pipefail
pod trunk push AEPSignal.podspec --allow-warnings --synchronous --swift-version=5.1
pod trunk push AEPSignal.podspec --allow-warnings --synchronous
env:
COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}

1 change: 0 additions & 1 deletion .swift-version

This file was deleted.

2 changes: 2 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ disabled_rules: # rule identifiers to exclude from running
- trailing_comma
- type_body_length
- trailing_whitespace
- notification_center_detachment
- for_where

analyzer_rules:
- unused_import
10 changes: 5 additions & 5 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 = "4.2.0"
s.version = "5.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 @@ -10,15 +10,15 @@ Pod::Spec.new do |s|
s.author = "Adobe Experience Platform SDK Team"
s.source = { :git => "https://github.com/adobe/aepsdk-core-ios", :tag => s.version.to_s }

s.ios.deployment_target = '11.0'
s.tvos.deployment_target = '11.0'
s.ios.deployment_target = '12.0'
s.tvos.deployment_target = '12.0'

s.swift_version = '5.1'

s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES' }

s.dependency 'AEPRulesEngine', '>= 4.0.0'
s.dependency 'AEPServices', '>= 4.2.0'
s.dependency 'AEPRulesEngine', '>= 5.0.0', '< 6.0.0'
s.dependency 'AEPServices', '>= 5.0.0', '< 6.0.0'


s.source_files = 'AEPCore/Sources/**/*.swift'
Expand Down
Loading