From aafbfc27986c2026f1e6bb3d4a0d93b70ee2635b Mon Sep 17 00:00:00 2001 From: Ivan Artemiev <29709626+iartemiev@users.noreply.github.com> Date: Wed, 8 Apr 2020 12:39:33 -0400 Subject: [PATCH] chore: 0.11.0 release + add sleep between pod pushes --- .circleci/config.yml | 7 ++--- .jazzy.yaml | 2 +- AWSPluginsCore.podspec | 4 +-- AWSPredictionsPlugin.podspec | 4 +-- Amplify.podspec | 2 +- Amplify/Info.plist | 2 +- AmplifyFunctionalTests/Info.plist | 2 +- AmplifyPlugins.podspec | 4 +-- .../API/AWSAPICategoryPlugin/Info.plist | 2 +- .../Resources/Info.plist | 2 +- AmplifyPlugins/Core/AWSPluginsCore/Info.plist | 2 +- .../AmplifyAWSServiceConfiguration.swift | 2 +- .../Core/AWSPluginsCoreTests/Info.plist | 2 +- .../Core/AWSPluginsTestCommon/Info.plist | 2 +- .../AWSPredictionsPlugin/Resources/Info.plist | 2 +- .../Resources/Info.plist | 2 +- .../AWSS3StoragePlugin/Resources/Info.plist | 2 +- AmplifyTestApp/Info.plist | 2 +- AmplifyTestCommon.podspec | 6 ++-- AmplifyTestCommon/Info.plist | 2 +- AmplifyTests/Info.plist | 2 +- CoreMLPredictionsPlugin.podspec | 4 +-- fastlane/Fastfile | 29 ++++++++++--------- 23 files changed, 45 insertions(+), 45 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a16bf14fa9..3d54b08cd7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,7 @@ version: 2.1 defaults: &defaults macos: - xcode: "11.2.1" + xcode: "11.4.0" working_directory: ~/amplify-ios environment: BUNDLE_PATH: vendor/bundle @@ -157,13 +157,10 @@ jobs: - *restore_repo - restore_gems - check_bundle - # - run: - # name: Bump pod versions - # command: bundle exec fastlane bump_podspecs_patch - run: name: Release pods command: bundle exec fastlane release_pods - + no_output_timeout: 20m workflows: build_test_deploy: diff --git a/.jazzy.yaml b/.jazzy.yaml index 1048dbad76..2e498c54cb 100644 --- a/.jazzy.yaml +++ b/.jazzy.yaml @@ -1,5 +1,5 @@ module: Amplify -module_version: 0.9.0 +module_version: 0.11.0 author: Amazon Web Services github_url: https://github.com/aws-amplify/amplify-ios diff --git a/AWSPluginsCore.podspec b/AWSPluginsCore.podspec index f52b6c2079..df0fb43b40 100644 --- a/AWSPluginsCore.podspec +++ b/AWSPluginsCore.podspec @@ -9,7 +9,7 @@ Pod::Spec.new do |s| s.name = 'AWSPluginsCore' - s.version = '0.10.0' + s.version = '0.11.0' s.summary = 'Amazon Web Services Amplify for iOS.' s.description = 'AWS Amplify for iOS provides a declarative library for application development using cloud services' @@ -25,7 +25,7 @@ Pod::Spec.new do |s| AWS_SDK_VERSION = "~> 2.13.0" s.source_files = 'AmplifyPlugins/Core/AWSPluginsCore/**/*.swift' - s.dependency 'Amplify', '0.10.0' + s.dependency 'Amplify', '0.11.0' s.dependency 'AWSMobileClient', AWS_SDK_VERSION end diff --git a/AWSPredictionsPlugin.podspec b/AWSPredictionsPlugin.podspec index 9edc81d7c0..fe7203a6a8 100644 --- a/AWSPredictionsPlugin.podspec +++ b/AWSPredictionsPlugin.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'AWSPredictionsPlugin' - s.version = '0.10.0' + s.version = '0.11.0' s.summary = 'Amazon Web Services Amplify for iOS.' s.description = 'AWS Amplify for iOS provides a declarative library for application development using cloud services' @@ -15,7 +15,7 @@ Pod::Spec.new do |s| s.requires_arc = true AWS_SDK_VERSION = '~> 2.13.0' - AMPLIFY_VERSION = '0.10.0' + AMPLIFY_VERSION = '0.11.0' s.source_files = 'AmplifyPlugins/Predictions/AWSPredictionsPlugin/**/*.swift' s.dependency 'AWSComprehend', AWS_SDK_VERSION diff --git a/Amplify.podspec b/Amplify.podspec index fad5de346d..173883dee9 100644 --- a/Amplify.podspec +++ b/Amplify.podspec @@ -9,7 +9,7 @@ Pod::Spec.new do |s| s.name = 'Amplify' - s.version = '0.10.0' + s.version = '0.11.0' s.summary = 'Amazon Web Services Amplify for iOS.' s.description = 'AWS Amplify for iOS provides a declarative library for application development using cloud services' diff --git a/Amplify/Info.plist b/Amplify/Info.plist index a5743c42c9..683222bb6b 100644 --- a/Amplify/Info.plist +++ b/Amplify/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.10.0 + 0.11.0 CFBundleVersion $(CURRENT_PROJECT_VERSION) diff --git a/AmplifyFunctionalTests/Info.plist b/AmplifyFunctionalTests/Info.plist index 94c5a7724e..57d66c3fdb 100644 --- a/AmplifyFunctionalTests/Info.plist +++ b/AmplifyFunctionalTests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 0.10.0 + 0.11.0 CFBundleVersion 1 diff --git a/AmplifyPlugins.podspec b/AmplifyPlugins.podspec index 089d996db1..789a6b2b6f 100644 --- a/AmplifyPlugins.podspec +++ b/AmplifyPlugins.podspec @@ -9,7 +9,7 @@ Pod::Spec.new do |s| s.name = 'AmplifyPlugins' - s.version = '0.10.0' + s.version = '0.11.0' s.summary = 'Amazon Web Services Amplify for iOS.' s.description = 'AWS Amplify for iOS provides a declarative library for application development using cloud services' @@ -23,7 +23,7 @@ Pod::Spec.new do |s| s.requires_arc = true AWS_SDK_VERSION = '~> 2.13.0' - AMPLIFY_VERSION = '0.10.0' + AMPLIFY_VERSION = '0.11.0' s.subspec 'AWSAPIPlugin' do |ss| ss.source_files = 'AmplifyPlugins/API/AWSAPICategoryPlugin/**/*.swift' diff --git a/AmplifyPlugins/API/AWSAPICategoryPlugin/Info.plist b/AmplifyPlugins/API/AWSAPICategoryPlugin/Info.plist index a5743c42c9..683222bb6b 100644 --- a/AmplifyPlugins/API/AWSAPICategoryPlugin/Info.plist +++ b/AmplifyPlugins/API/AWSAPICategoryPlugin/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.10.0 + 0.11.0 CFBundleVersion $(CURRENT_PROJECT_VERSION) diff --git a/AmplifyPlugins/Analytics/AWSPinpointAnalyticsPlugin/Resources/Info.plist b/AmplifyPlugins/Analytics/AWSPinpointAnalyticsPlugin/Resources/Info.plist index a5743c42c9..683222bb6b 100644 --- a/AmplifyPlugins/Analytics/AWSPinpointAnalyticsPlugin/Resources/Info.plist +++ b/AmplifyPlugins/Analytics/AWSPinpointAnalyticsPlugin/Resources/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.10.0 + 0.11.0 CFBundleVersion $(CURRENT_PROJECT_VERSION) diff --git a/AmplifyPlugins/Core/AWSPluginsCore/Info.plist b/AmplifyPlugins/Core/AWSPluginsCore/Info.plist index a5743c42c9..683222bb6b 100644 --- a/AmplifyPlugins/Core/AWSPluginsCore/Info.plist +++ b/AmplifyPlugins/Core/AWSPluginsCore/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.10.0 + 0.11.0 CFBundleVersion $(CURRENT_PROJECT_VERSION) diff --git a/AmplifyPlugins/Core/AWSPluginsCore/ServiceConfiguration/AmplifyAWSServiceConfiguration.swift b/AmplifyPlugins/Core/AWSPluginsCore/ServiceConfiguration/AmplifyAWSServiceConfiguration.swift index d0898723e8..f9783a6465 100644 --- a/AmplifyPlugins/Core/AWSPluginsCore/ServiceConfiguration/AmplifyAWSServiceConfiguration.swift +++ b/AmplifyPlugins/Core/AWSPluginsCore/ServiceConfiguration/AmplifyAWSServiceConfiguration.swift @@ -12,7 +12,7 @@ public class AmplifyAWSServiceConfiguration: AWSServiceConfiguration { override public class func baseUserAgent() -> String! { //TODO: Retrieve this version from a centralized location: //https://github.com/aws-amplify/amplify-ios/issues/276 - let version = "0.10.0" + let version = "0.11.0" let sdkName = "amplify-iOS" let systemName = UIDevice.current.systemName.replacingOccurrences(of: " ", with: "-") let systemVersion = UIDevice.current.systemVersion diff --git a/AmplifyPlugins/Core/AWSPluginsCoreTests/Info.plist b/AmplifyPlugins/Core/AWSPluginsCoreTests/Info.plist index d45f046f07..d9cc540a72 100644 --- a/AmplifyPlugins/Core/AWSPluginsCoreTests/Info.plist +++ b/AmplifyPlugins/Core/AWSPluginsCoreTests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 0.10.0 + 0.11.0 CFBundleVersion 1 diff --git a/AmplifyPlugins/Core/AWSPluginsTestCommon/Info.plist b/AmplifyPlugins/Core/AWSPluginsTestCommon/Info.plist index 1e85a1afd8..3b7902e125 100644 --- a/AmplifyPlugins/Core/AWSPluginsTestCommon/Info.plist +++ b/AmplifyPlugins/Core/AWSPluginsTestCommon/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 0.10.0 + 0.11.0 CFBundleVersion $(CURRENT_PROJECT_VERSION) diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Resources/Info.plist b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Resources/Info.plist index a5743c42c9..683222bb6b 100644 --- a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Resources/Info.plist +++ b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Resources/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.10.0 + 0.11.0 CFBundleVersion $(CURRENT_PROJECT_VERSION) diff --git a/AmplifyPlugins/Predictions/CoreMLPredictionsPlugin/Resources/Info.plist b/AmplifyPlugins/Predictions/CoreMLPredictionsPlugin/Resources/Info.plist index a5743c42c9..683222bb6b 100644 --- a/AmplifyPlugins/Predictions/CoreMLPredictionsPlugin/Resources/Info.plist +++ b/AmplifyPlugins/Predictions/CoreMLPredictionsPlugin/Resources/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.10.0 + 0.11.0 CFBundleVersion $(CURRENT_PROJECT_VERSION) diff --git a/AmplifyPlugins/Storage/AWSS3StoragePlugin/Resources/Info.plist b/AmplifyPlugins/Storage/AWSS3StoragePlugin/Resources/Info.plist index a5743c42c9..683222bb6b 100644 --- a/AmplifyPlugins/Storage/AWSS3StoragePlugin/Resources/Info.plist +++ b/AmplifyPlugins/Storage/AWSS3StoragePlugin/Resources/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.10.0 + 0.11.0 CFBundleVersion $(CURRENT_PROJECT_VERSION) diff --git a/AmplifyTestApp/Info.plist b/AmplifyTestApp/Info.plist index f74d17b2b1..2697dea650 100644 --- a/AmplifyTestApp/Info.plist +++ b/AmplifyTestApp/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.10.0 + 0.11.0 CFBundleVersion 1 LSRequiresIPhoneOS diff --git a/AmplifyTestCommon.podspec b/AmplifyTestCommon.podspec index 481e003369..58522f514b 100644 --- a/AmplifyTestCommon.podspec +++ b/AmplifyTestCommon.podspec @@ -9,7 +9,7 @@ Pod::Spec.new do |spec| spec.name = "AmplifyTestCommon" - spec.version = "0.10.0" + spec.version = "0.11.0" spec.summary = "Test resources used by different targets" spec.description = "Provides different test resources and mock methods" @@ -22,10 +22,10 @@ Pod::Spec.new do |spec| spec.requires_arc = true spec.source_files = 'AmplifyTestCommon/**/*.swift' - spec.dependency 'Amplify', '0.10.0' + spec.dependency 'Amplify', '0.11.0' spec.subspec 'AWSPluginsTestCommon' do |subspec| subspec.source_files = 'AmplifyPlugins/Core/AWSPluginsTestCommon/**/*.swift' - spec.dependency 'AWSPluginsCore', '0.10.0' + spec.dependency 'AWSPluginsCore', '0.11.0' end end diff --git a/AmplifyTestCommon/Info.plist b/AmplifyTestCommon/Info.plist index a5743c42c9..683222bb6b 100644 --- a/AmplifyTestCommon/Info.plist +++ b/AmplifyTestCommon/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.10.0 + 0.11.0 CFBundleVersion $(CURRENT_PROJECT_VERSION) diff --git a/AmplifyTests/Info.plist b/AmplifyTests/Info.plist index 94c5a7724e..57d66c3fdb 100644 --- a/AmplifyTests/Info.plist +++ b/AmplifyTests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 0.10.0 + 0.11.0 CFBundleVersion 1 diff --git a/CoreMLPredictionsPlugin.podspec b/CoreMLPredictionsPlugin.podspec index 211a761925..cefd530891 100644 --- a/CoreMLPredictionsPlugin.podspec +++ b/CoreMLPredictionsPlugin.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'CoreMLPredictionsPlugin' - s.version = '0.10.0' + s.version = '0.11.0' s.summary = 'Amazon Web Services Amplify for iOS.' s.description = 'AWS Amplify for iOS provides a declarative library for application development using cloud services' @@ -14,7 +14,7 @@ Pod::Spec.new do |s| s.requires_arc = true s.source_files = 'AmplifyPlugins/Predictions/CoreMLPredictionsPlugin/**/*.swift' - s.dependency 'Amplify', '0.10.0' + s.dependency 'Amplify', '0.11.0' end diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 83d7a8f5c3..cebd8ba797 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -17,27 +17,30 @@ opt_out_usage default_platform(:ios) +COCOAPODS_PUSH_WAIT_TIME = 600 + pods = [ - "Amplify.podspec", - "AWSPluginsCore.podspec", - "CoreMLPredictionsPlugin.podspec", - "AWSPredictionsPlugin.podspec", - "AmplifyPlugins.podspec" + {spec: "Amplify.podspec", sleep: true}, + # AmplifyPlugins depends on AWSPluginsCore, but skipping the sleep here + # since there's one after CoreMLPredictionsPlugin + {spec: "AWSPluginsCore.podspec", sleep: false}, + {spec: "CoreMLPredictionsPlugin.podspec", sleep: true}, + {spec: "AWSPredictionsPlugin.podspec", sleep: false}, + {spec: "AmplifyPlugins.podspec", sleep: false} ] platform :ios do - desc "Bump pod versions" - lane :bump_podspecs_patch do - - pods.each { |pod| version_bump_podspec(path: pod, bump_type: "patch") } - - end - desc "Release pods" lane :release_pods do pods.each { |pod| - pod_push(path: pod, allow_warnings: true, swift_version: "5.1") + UI.message("Pushing pod #{pod[:spec]}") + pod_push(path: pod[:spec], allow_warnings: true, swift_version: "5.1") + if pod[:sleep] + UI.message("Sleeping for #{COCOAPODS_PUSH_WAIT_TIME}s") + sleep COCOAPODS_PUSH_WAIT_TIME + end + Actions.sh('pod repo update') }