diff --git a/.circleci/config.yml b/.circleci/config.yml index 3bd0d2ebe..7e634ae5d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -57,39 +57,6 @@ jobs: - store_artifacts: path: build/reports destination: test_results - facebook_utils: - <<: *defaults - steps: - - checkout - - restore_cache: *cache-pull - - run: *prepare - - save_cache: *cache-push - - run: bundle exec rake test:facebook_utils:ios - - run: bash <(curl -s https://codecov.io/bash) - - store_test_results: - path: build/reports - twitter_utils: - <<: *defaults - steps: - - checkout - - restore_cache: *cache-pull - - run: *prepare - - save_cache: *cache-push - - run: bundle exec rake test:twitter_utils:ios - - run: bash <(curl -s https://codecov.io/bash) - - store_test_results: - path: build/reports - parseui: - <<: *defaults - steps: - - checkout - - restore_cache: *cache-pull - - run: *prepare - - save_cache: *cache-push - - run: bundle exec rake test:parseui:all - - run: bash <(curl -s https://codecov.io/bash) - - store_test_results: - path: build/reports carthage: <<: *defaults steps: @@ -105,9 +72,6 @@ workflows: jobs: - ios - macos - - facebook_utils - - twitter_utils - - parseui - carthage: requires: - ios diff --git a/.travis.yml b/.travis.yml index 4792fe1ac..453b75758 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,8 @@ branches: - master - /^v?[0-9]+\.[0-9]+\.[0-9]+(-.*)?$/ cache: - - bundle + directories: + - vendor/bundle jobs: include: @@ -14,7 +15,7 @@ jobs: env: Deployment install: - bundle config set path 'vendor/bundle' - - bundle install + - travis_wait bundle install script: - bundle exec rake package:release deploy: @@ -28,27 +29,39 @@ jobs: tags: true all_branches: true - stage: release - env: Docs + env: Facebook_Utils install: - bundle config set path 'vendor/bundle' - - bundle install + - travis_wait bundle install script: - - ./Scripts/jazzy.sh - deploy: - - provider: pages - skip_cleanup: true - github_token: $GITHUB_TOKEN - local_dir: ./docs/ - on: - all_branches: true - tags: true + - bundle exec rake test:facebook_utils:ios + after_script: + - bash <(curl -s https://codecov.io/bash) + - stage: release + env: Twitter_Utils + install: + - bundle config set path 'vendor/bundle' + - travis_wait bundle install + script: + - bundle exec rake test:twitter_utils:ios + after_script: + - bash <(curl -s https://codecov.io/bash) + - stage: release + env: ParseUI + install: + - bundle config set path 'vendor/bundle' + - travis_wait bundle install + script: + - bundle exec rake test:parseui:all + after_script: + - bash <(curl -s https://codecov.io/bash) - stage: release env: Cocoapods install: - bundle config set path 'vendor/bundle' - - bundle install - - bundle exec pod setup + - travis_wait bundle install script: + - bundle exec pod setup - travis_wait bundle exec pod lib lint --allow-warnings deploy: - provider: script @@ -57,3 +70,19 @@ jobs: on: tags: true all_branches: true + - stage: release + env: Docs + install: + - bundle config set path 'vendor/bundle' + - travis_wait bundle install + script: + - ./Scripts/jazzy.sh + deploy: + - provider: pages + skip_cleanup: true + github_token: $GITHUB_TOKEN + local_dir: ./docs/ + on: + all_branches: true + tags: true + diff --git a/CHANGELOG.md b/CHANGELOG.md index 37ec1941b..091155905 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,23 @@ # Parse-SDK-iOS-OSX Changelog ### master -[Full Changelog](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/1.18.0...master) +[Full Changelog](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/1.19.0...master) * _Contributing to this repo? Add info about your change here to be included in next release_ +### 1.19.0 +[Full Changelog](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/1.18.0...1.19.0) + +__New features__ +- Added Sign In With Apple support to ParseUI [#1475](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1475), thanks to [Darren Black](https://github.com/drdaz). Transparent icons thanks to [Donald Ness](https://github.com/programmarchy) + +__Improvements__ +- Updated Facebook SDK to 6.x [#1504](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1504), thanks to [Markus Winkler](https://github.com/markuswinkler) + +__Fixes__ +- Removes deprecated UIWebView usage [#1511](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1511), thanks to [Nathan Kellert](https://github.com/parse-community/Parse-SDK-iOS-OSX/commits?author=noobs2ninjas) +- Fixes building with Xcode 12 [#1527](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1527), thanks to [Steffen Matthischke](https://github.com/HeEAaD) + + ### 1.18.0 [Full Changelog](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/1.17.3...1.18.0) diff --git a/Parse.podspec b/Parse.podspec index 0d095e252..325a5e02c 100644 --- a/Parse.podspec +++ b/Parse.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Parse' - s.version = '1.18.0' + s.version = '1.19.0' s.license = { :type => 'BSD', :file => 'LICENSE' } s.homepage = 'http://parseplatform.org/' s.summary = 'A library that gives you access to the powerful Parse cloud platform from your iOS/OS X/watchOS/tvOS app.' diff --git a/Parse/Parse.xcodeproj/project.pbxproj b/Parse/Parse.xcodeproj/project.pbxproj index 54f6d777c..cead8e74a 100644 --- a/Parse/Parse.xcodeproj/project.pbxproj +++ b/Parse/Parse.xcodeproj/project.pbxproj @@ -8966,7 +8966,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 810154FE1BB382F800D7C7BD /* Parse-watchOS.xcconfig */; buildSettings = { - CURRENT_PROJECT_VERSION = 1.18.0; SWIFT_VERSION = 5.0; }; name = Debug; @@ -8975,7 +8974,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 810154FE1BB382F800D7C7BD /* Parse-watchOS.xcconfig */; buildSettings = { - CURRENT_PROJECT_VERSION = 1.18.0; SWIFT_VERSION = 5.0; }; name = Release; @@ -8984,8 +8982,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 815F24171BD04D310054659F /* Parse-tvOS.xcconfig */; buildSettings = { - CURRENT_PROJECT_VERSION = 1.18.0; - MARKETING_VERSION = 1.18.0; }; name = Debug; }; @@ -8993,8 +8989,6 @@ isa = XCBuildConfiguration; baseConfigurationReference = 815F24171BD04D310054659F /* Parse-tvOS.xcconfig */; buildSettings = { - CURRENT_PROJECT_VERSION = 1.18.0; - MARKETING_VERSION = 1.18.0; }; name = Release; }; @@ -9045,7 +9039,6 @@ baseConfigurationReference = F55ABB531B4F39DA00A0ECD5 /* Parse-iOS.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 1.18.0; DEFINES_MODULE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -9053,7 +9046,6 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.18.0; SUPPORTS_MACCATALYST = NO; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -9066,7 +9058,6 @@ baseConfigurationReference = F55ABB531B4F39DA00A0ECD5 /* Parse-iOS.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 1.18.0; DEFINES_MODULE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -9074,7 +9065,6 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 1.18.0; SUPPORTS_MACCATALYST = NO; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -9086,8 +9076,6 @@ baseConfigurationReference = 81C582DE1C3B0A40000063C6 /* Parse-iOS-Dynamic.xcconfig */; buildSettings = { CLANG_MODULES_AUTOLINK = YES; - CURRENT_PROJECT_VERSION = 1.18.0; - MARKETING_VERSION = 1.18.0; SUPPORTS_MACCATALYST = NO; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -9098,8 +9086,6 @@ baseConfigurationReference = 81C582DE1C3B0A40000063C6 /* Parse-iOS-Dynamic.xcconfig */; buildSettings = { CLANG_MODULES_AUTOLINK = YES; - CURRENT_PROJECT_VERSION = 1.18.0; - MARKETING_VERSION = 1.18.0; SUPPORTS_MACCATALYST = NO; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -9110,8 +9096,6 @@ baseConfigurationReference = 81C582DF1C3B0A40000063C6 /* Parse-tvOS-Dynamic.xcconfig */; buildSettings = { CLANG_MODULES_AUTOLINK = YES; - CURRENT_PROJECT_VERSION = 1.18.0; - MARKETING_VERSION = 1.18.0; }; name = Debug; }; @@ -9120,8 +9104,6 @@ baseConfigurationReference = 81C582DF1C3B0A40000063C6 /* Parse-tvOS-Dynamic.xcconfig */; buildSettings = { CLANG_MODULES_AUTOLINK = YES; - CURRENT_PROJECT_VERSION = 1.18.0; - MARKETING_VERSION = 1.18.0; }; name = Release; }; @@ -9130,7 +9112,6 @@ baseConfigurationReference = 81C582E01C3B0A40000063C6 /* Parse-watchOS-Dynamic.xcconfig */; buildSettings = { CLANG_MODULES_AUTOLINK = YES; - CURRENT_PROJECT_VERSION = 1.18.0; }; name = Debug; }; @@ -9139,7 +9120,6 @@ baseConfigurationReference = 81C582E01C3B0A40000063C6 /* Parse-watchOS-Dynamic.xcconfig */; buildSettings = { CLANG_MODULES_AUTOLINK = YES; - CURRENT_PROJECT_VERSION = 1.18.0; }; name = Release; }; @@ -9147,9 +9127,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = F55ABB541B4F39DA00A0ECD5 /* Parse-macOS.xcconfig */; buildSettings = { - CURRENT_PROJECT_VERSION = 1.18.0; MACOSX_DEPLOYMENT_TARGET = 10.12; - MARKETING_VERSION = 1.18.0; }; name = Debug; }; @@ -9157,9 +9135,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = F55ABB541B4F39DA00A0ECD5 /* Parse-macOS.xcconfig */; buildSettings = { - CURRENT_PROJECT_VERSION = 1.18.0; MACOSX_DEPLOYMENT_TARGET = 10.12; - MARKETING_VERSION = 1.18.0; }; name = Release; }; diff --git a/Parse/Parse/PFConstants.h b/Parse/Parse/PFConstants.h index 428cf39c5..67d328365 100644 --- a/Parse/Parse/PFConstants.h +++ b/Parse/Parse/PFConstants.h @@ -13,7 +13,7 @@ #pragma mark - SDK Version ///-------------------------------------- -#define PARSE_VERSION @"1.18.0" +#define PARSE_VERSION @"1.19.0" ///-------------------------------------- #pragma mark - Platform diff --git a/Parse/Parse/Resources/Parse-OSX.Info.plist b/Parse/Parse/Resources/Parse-OSX.Info.plist index 3aa1e4c57..bf500a111 100644 --- a/Parse/Parse/Resources/Parse-OSX.Info.plist +++ b/Parse/Parse/Resources/Parse-OSX.Info.plist @@ -13,10 +13,10 @@ CFBundlePackageType FMWK CFBundleShortVersionString - $(MARKETING_VERSION) + 1.19.0 CFBundleSignature ???? CFBundleVersion - $(CURRENT_PROJECT_VERSION) + 1.19.0 diff --git a/Parse/Parse/Resources/Parse-iOS.Info.plist b/Parse/Parse/Resources/Parse-iOS.Info.plist index e1a10672c..f4f37d9fb 100644 --- a/Parse/Parse/Resources/Parse-iOS.Info.plist +++ b/Parse/Parse/Resources/Parse-iOS.Info.plist @@ -13,7 +13,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - $(MARKETING_VERSION) + 1.19.0 CFBundleSignature ???? CFBundleSupportedPlatforms @@ -21,7 +21,7 @@ iPhoneOS CFBundleVersion - $(CURRENT_PROJECT_VERSION) + 1.19.0 MinimumOSVersion 8.0 diff --git a/Parse/Parse/Resources/Parse-tvOS.Info.plist b/Parse/Parse/Resources/Parse-tvOS.Info.plist index ca23c84f4..6e6fb8c6b 100644 --- a/Parse/Parse/Resources/Parse-tvOS.Info.plist +++ b/Parse/Parse/Resources/Parse-tvOS.Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType FMWK CFBundleShortVersionString - $(MARKETING_VERSION) + 1.19.0 CFBundleSignature ???? CFBundleVersion - $(CURRENT_PROJECT_VERSION) + 1.19.0 NSPrincipalClass diff --git a/Parse/Parse/Resources/Parse-watchOS.Info.plist b/Parse/Parse/Resources/Parse-watchOS.Info.plist index 45ff487c9..6e6fb8c6b 100644 --- a/Parse/Parse/Resources/Parse-watchOS.Info.plist +++ b/Parse/Parse/Resources/Parse-watchOS.Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.18.0 + 1.19.0 CFBundleSignature ???? CFBundleVersion - $(CURRENT_PROJECT_VERSION) + 1.19.0 NSPrincipalClass diff --git a/Parse/Tests/Other/TestCases/TestCase/PFTestCase.m b/Parse/Tests/Other/TestCases/TestCase/PFTestCase.m index ba37796c4..b775f992d 100644 --- a/Parse/Tests/Other/TestCases/TestCase/PFTestCase.m +++ b/Parse/Tests/Other/TestCases/TestCase/PFTestCase.m @@ -106,7 +106,7 @@ - (XCTestExpectation *)currentSelectorTestExpectation { } - (void)waitForTestExpectations { - [self waitForExpectationsWithTimeout:15.0 handler:nil]; + [self waitForExpectationsWithTimeout:25.0 handler:nil]; } ///-------------------------------------- diff --git a/Parse/Tests/Unit/FileControllerTests.m b/Parse/Tests/Unit/FileControllerTests.m index e6a5fc0bc..f5500670c 100644 --- a/Parse/Tests/Unit/FileControllerTests.m +++ b/Parse/Tests/Unit/FileControllerTests.m @@ -395,9 +395,7 @@ - (void)testDownloadStreamSharesOperations { [taskCompletionSource trySetResult:nil]; -// [self waitForTestExpectations]; - //TODO:- Changed waitFOrExpectations - [self waitForExpectations:@[firstExpectation, secondExpectation] timeout:20.0]; + [self waitForExpectations:@[firstExpectation, secondExpectation] timeout:50.0]; } - (void)testUpload { diff --git a/ParseFacebookUtils/Resources/Info-iOS.plist b/ParseFacebookUtils/Resources/Info-iOS.plist index 19bf3df84..4fd7fc513 100644 --- a/ParseFacebookUtils/Resources/Info-iOS.plist +++ b/ParseFacebookUtils/Resources/Info-iOS.plist @@ -13,7 +13,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.18.0 + 1.19.0 CFBundleSignature ???? CFBundleSupportedPlatforms @@ -21,7 +21,7 @@ iPhoneOS CFBundleVersion - 1.18.0 + 1.19.0 MinimumOSVersion 6.0 diff --git a/ParseFacebookUtils/Resources/Info-tvOS.plist b/ParseFacebookUtils/Resources/Info-tvOS.plist index a1fa0c4c7..d5008ffac 100644 --- a/ParseFacebookUtils/Resources/Info-tvOS.plist +++ b/ParseFacebookUtils/Resources/Info-tvOS.plist @@ -13,10 +13,10 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.18.0 + 1.19.0 CFBundleSignature ???? CFBundleVersion - 1.18.0 + 1.19.0 diff --git a/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/Resources/Info.plist b/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/Resources/Info.plist index 545990df0..1cd8efe1c 100644 --- a/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/Resources/Info.plist +++ b/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/Resources/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.18.0 + 1.19.0 CFBundleSignature ???? CFBundleVersion - 1.18.0 + 1.19.0 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSMainNibFile diff --git a/ParseStarterProject/OSX/ParseOSXStarterProject/Resources/Info.plist b/ParseStarterProject/OSX/ParseOSXStarterProject/Resources/Info.plist index 6e1b6f712..d466014a5 100644 --- a/ParseStarterProject/OSX/ParseOSXStarterProject/Resources/Info.plist +++ b/ParseStarterProject/OSX/ParseOSXStarterProject/Resources/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.18.0 + 1.19.0 CFBundleSignature ???? CFBundleVersion - 1.18.0 + 1.19.0 LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} NSMainNibFile diff --git a/ParseStarterProject/iOS/ParseStarterProject-Swift/Resources/Info.plist b/ParseStarterProject/iOS/ParseStarterProject-Swift/Resources/Info.plist index 1b3808ff0..5ade1365e 100644 --- a/ParseStarterProject/iOS/ParseStarterProject-Swift/Resources/Info.plist +++ b/ParseStarterProject/iOS/ParseStarterProject-Swift/Resources/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.18.0 + 1.19.0 CFBundleSignature ???? CFBundleVersion - 1.18.0 + 1.19.0 LSRequiresIPhoneOS UILaunchStoryboardName diff --git a/ParseStarterProject/iOS/ParseStarterProject/Resources/Info.plist b/ParseStarterProject/iOS/ParseStarterProject/Resources/Info.plist index 23e1fd17e..631056140 100644 --- a/ParseStarterProject/iOS/ParseStarterProject/Resources/Info.plist +++ b/ParseStarterProject/iOS/ParseStarterProject/Resources/Info.plist @@ -19,11 +19,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.18.0 + 1.19.0 CFBundleSignature ???? CFBundleVersion - 1.18.0 + 1.19.0 LSRequiresIPhoneOS NSMainNibFile diff --git a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/Info.plist b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/Info.plist index 7d2a8e852..9fafd39f6 100644 --- a/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/Info.plist +++ b/ParseStarterProject/tvOS/ParseStarterProject-Swift/ParseStarter/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.18.0 + 1.19.0 CFBundleSignature ???? CFBundleVersion - 1.18.0 + 1.19.0 LSRequiresIPhoneOS UIMainStoryboardFile diff --git a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter Extension/Info.plist b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter Extension/Info.plist index 6700f65ea..808d0557c 100644 --- a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter Extension/Info.plist +++ b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter Extension/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.18.0 + 1.19.0 CFBundleSignature ???? CFBundleVersion - 1.18.0 + 1.19.0 NSExtension NSExtensionAttributes diff --git a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter/Info.plist b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter/Info.plist index 60c509479..02e88d32e 100644 --- a/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter/Info.plist +++ b/ParseStarterProject/watchOS/ParseStarterProject-Swift/ParseStarter/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.18.0 + 1.19.0 CFBundleSignature ???? CFBundleVersion - 1.18.0 + 1.19.0 UISupportedInterfaceOrientations UIInterfaceOrientationPortrait diff --git a/ParseStarterProject/watchOS/ParseStarterProject-Swift/Resources/Info.plist b/ParseStarterProject/watchOS/ParseStarterProject-Swift/Resources/Info.plist index 5a8698fff..cc4f34791 100644 --- a/ParseStarterProject/watchOS/ParseStarterProject-Swift/Resources/Info.plist +++ b/ParseStarterProject/watchOS/ParseStarterProject-Swift/Resources/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.18.0 + 1.19.0 CFBundleSignature ???? CFBundleVersion - 1.18.0 + 1.19.0 LSRequiresIPhoneOS UIMainStoryboardFile diff --git a/ParseTwitterUtils/Resources/Info.plist b/ParseTwitterUtils/Resources/Info.plist index 12233270d..ef64647bf 100644 --- a/ParseTwitterUtils/Resources/Info.plist +++ b/ParseTwitterUtils/Resources/Info.plist @@ -13,7 +13,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.18.0 + 1.19.0 CFBundleSignature ???? CFBundleSupportedPlatforms @@ -21,7 +21,7 @@ iPhoneOS CFBundleVersion - 1.18.0 + 1.19.0 MinimumOSVersion 6.0 diff --git a/ParseUI/ParseUI.xcodeproj/project.pbxproj b/ParseUI/ParseUI.xcodeproj/project.pbxproj index 7baf9b56e..8fdc75630 100644 --- a/ParseUI/ParseUI.xcodeproj/project.pbxproj +++ b/ParseUI/ParseUI.xcodeproj/project.pbxproj @@ -2134,7 +2134,6 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1.18.0; DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -2156,7 +2155,6 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 1.18.0; MTL_ENABLE_DEBUG_INFO = YES; SKIP_INSTALL = YES; SUPPORTS_MACCATALYST = NO; @@ -2201,7 +2199,6 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1.18.0; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -2218,7 +2215,6 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 1.18.0; MTL_ENABLE_DEBUG_INFO = NO; SKIP_INSTALL = YES; SUPPORTS_MACCATALYST = NO; @@ -2263,7 +2259,6 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1.18.0; DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -2289,7 +2284,6 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 1.18.0; MTL_ENABLE_DEBUG_INFO = YES; SKIP_INSTALL = YES; SUPPORTS_MACCATALYST = NO; @@ -2333,7 +2327,6 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1.18.0; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -2354,7 +2347,6 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 1.18.0; MTL_ENABLE_DEBUG_INFO = NO; SKIP_INSTALL = YES; SUPPORTS_MACCATALYST = NO; diff --git a/ParseUI/Resources/Info.plist b/ParseUI/Resources/Info.plist index a8c1d6846..bc283b56d 100644 --- a/ParseUI/Resources/Info.plist +++ b/ParseUI/Resources/Info.plist @@ -13,7 +13,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - $(MARKETING_VERSION) + 1.19.0 CFBundleSignature ???? CFBundleSupportedPlatforms @@ -21,7 +21,7 @@ iPhoneOS CFBundleVersion - $(CURRENT_PROJECT_VERSION) + 1.19.0 MinimumOSVersion 8.0 diff --git a/README.md b/README.md index d04119f71..735fd3138 100644 --- a/README.md +++ b/README.md @@ -128,6 +128,12 @@ You can use the rake task in order to bump the version number, it's safe, and wi $ bundle exec rake package:set_version[X.X.X] ``` +Note that zsh users (such as those using macOS >= 10.15) need to escape the brackets as follows: + +``` +$ bundle exec rake package:set_version\[X.X.X\] +``` + Replace X.X.X by the version number and push to the repository. ## Dependencies @@ -137,10 +143,6 @@ We use the following libraries as dependencies inside of Parse: - [Bolts][bolts-framework], for task management. - [OCMock][ocmock-framework], for unit testing. -## Other Parse Projects - - - [ParseUI for iOS][parseui-link] - ## License ```