From b78a418b0287c1d8055ff507c64472fc6e2b9da0 Mon Sep 17 00:00:00 2001 From: Anton Domashnev Date: Wed, 7 Jun 2017 22:06:59 +0200 Subject: [PATCH 1/2] Convert project to swift 3.2; --- .swift-version | 2 +- .../project.pbxproj | 16 +++++++++++++++- .../ADMozaikCollectionViewLayout.xcscheme | 2 +- .../CodeGenerated/AutoEquatable.generated.swift | 2 +- .../CodeGenerated/AutoHashable.generated.swift | 2 +- Example/Example.xcodeproj/project.pbxproj | 14 +++++++++++++- Podfile | 2 ++ Podfile.lock | 12 ++++++------ 8 files changed, 40 insertions(+), 12 deletions(-) diff --git a/.swift-version b/.swift-version index 9f55b2c..a3ec5a4 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -3.0 +3.2 diff --git a/ADMozaikCollectionViewLayout.xcodeproj/project.pbxproj b/ADMozaikCollectionViewLayout.xcodeproj/project.pbxproj index fe616ce..302faa9 100644 --- a/ADMozaikCollectionViewLayout.xcodeproj/project.pbxproj +++ b/ADMozaikCollectionViewLayout.xcodeproj/project.pbxproj @@ -286,7 +286,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 0820; + LastUpgradeCheck = 0900; ORGANIZATIONNAME = "Anton Domashnev"; TargetAttributes = { 6D7BE5B01CEA148400A41445 = { @@ -492,14 +492,20 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -528,6 +534,7 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -543,14 +550,20 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -572,6 +585,7 @@ MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; diff --git a/ADMozaikCollectionViewLayout.xcodeproj/xcshareddata/xcschemes/ADMozaikCollectionViewLayout.xcscheme b/ADMozaikCollectionViewLayout.xcodeproj/xcshareddata/xcschemes/ADMozaikCollectionViewLayout.xcscheme index 2ce28e1..ad41830 100644 --- a/ADMozaikCollectionViewLayout.xcodeproj/xcshareddata/xcschemes/ADMozaikCollectionViewLayout.xcscheme +++ b/ADMozaikCollectionViewLayout.xcodeproj/xcshareddata/xcschemes/ADMozaikCollectionViewLayout.xcscheme @@ -1,6 +1,6 @@ 'https://github.com/Quick/Nimble.git', :branch=>'master' end end + + diff --git a/Podfile.lock b/Podfile.lock index 328fd62..1a0c4b6 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -5,8 +5,8 @@ PODS: - FBSnapshotTestCase/Core (2.1.4) - FBSnapshotTestCase/SwiftSupport (2.1.4): - FBSnapshotTestCase/Core - - Nimble (7.0.0) - - Sourcery (0.6.0) + - Nimble (7.0.1) + - Sourcery (0.6.1) DEPENDENCIES: - FBSnapshotsViewerRunPhaseScript (~> 0.1) @@ -27,15 +27,15 @@ CHECKOUT OPTIONS: :commit: d9ec82be11d473576258f107489f7013ee321771 :git: https://github.com/facebook/ios-snapshot-test-case.git Nimble: - :commit: 40e892ccd43d82b5eed1b9944822945fb5c4965f + :commit: 39b67002306fda9de4c9fd1290a6295f97edd09e :git: https://github.com/Quick/Nimble.git SPEC CHECKSUMS: FBSnapshotsViewerRunPhaseScript: 9f91d09b6373896903e6eefc23232f16a03418e5 FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a - Nimble: 67063ced9dad28bd882c7faa39f46a1409cf7296 - Sourcery: b3a93fcdf9c256feeb16e85f4d1bbf46baa42464 + Nimble: f8cda7a16ec2180b57905dd50b28127220f66a17 + Sourcery: 1426fbb5fe2d53f1e03845e989a89b6b67ce4e33 -PODFILE CHECKSUM: 6511e20895d718a8abe2ae5c56e13aa071e6fb48 +PODFILE CHECKSUM: 4d555b9fc4ad78f71b98c97b08d509ba18d0373e COCOAPODS: 1.2.1 From 7fcdaed6bef205a320954a80f06c7cd0b9788230 Mon Sep 17 00:00:00 2001 From: Anton Domashnev Date: Wed, 7 Jun 2017 22:07:33 +0200 Subject: [PATCH 2/2] Update changelog; --- CHANGELOG.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.yml b/CHANGELOG.yml index ed1ae01..2959272 100644 --- a/CHANGELOG.yml +++ b/CHANGELOG.yml @@ -1,7 +1,8 @@ --- upcoming: - version: + version: 4.0.2 notes: + - Swift 3.2 updates releases: - version: 4.0.1 notes: