Skip to content

Commit 3640d29

Browse files
m1entusm1entus
committed
Merge branch 'swift3'
# Conflicts: # INSPhotoGallery/INSPhotosTransitionAnimator.swift # INSPhotoGallery/INSPhotosViewController.swift # INSPhotoGallery/UIVIew+INSPhotoViewer.swift
2 parents c28f612 + 0317670 commit 3640d29

File tree

96 files changed

+6751
-5507
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+6751
-5507
lines changed

‎Example/INSPhotoGallery.xcodeproj/project.pbxproj‎

Lines changed: 40 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
642427441CDE10970037E8DA /* INSPhotoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6424273A1CDE10970037E8DA /* INSPhotoViewController.swift */; };
2121
642427451CDE10970037E8DA /* INSScalingImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6424273B1CDE10970037E8DA /* INSScalingImageView.swift */; };
2222
642427461CDE10970037E8DA /* UIVIew+INSPhotoViewer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6424273C1CDE10970037E8DA /* UIVIew+INSPhotoViewer.swift */; };
23-
CC2C6F6CFCB580C59030916E /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BFDCCEF4783A040A397D6717 /* Pods.framework */; };
2423
D2EF35F51CB288F300033131 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2EF35F41CB288F300033131 /* AppDelegate.swift */; };
2524
D2EF35F71CB288F300033131 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2EF35F61CB288F300033131 /* ViewController.swift */; };
2625
D2EF35FA1CB288F300033131 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D2EF35F81CB288F300033131 /* Main.storyboard */; };
@@ -32,6 +31,7 @@
3231
D2EF36201CB299CF00033131 /* CustomOverlayView.xib in Resources */ = {isa = PBXBuildFile; fileRef = D2EF361F1CB299CF00033131 /* CustomOverlayView.xib */; };
3332
D2EF36221CB29C6600033131 /* CustomPhotoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2EF36211CB29C6600033131 /* CustomPhotoModel.swift */; };
3433
D2EF36241CB2A67800033131 /* CustomModelViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2EF36231CB2A67800033131 /* CustomModelViewController.swift */; };
34+
FB44620B1AE393EEB9BC3649 /* Pods_INSPhotoGallery.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 043F1D6415A9A5BC7A90DF71 /* Pods_INSPhotoGallery.framework */; };
3535
/* End PBXBuildFile section */
3636

3737
/* Begin PBXContainerItemProxy section */
@@ -59,7 +59,8 @@
5959
/* End PBXCopyFilesBuildPhase section */
6060

6161
/* Begin PBXFileReference section */
62-
52DA31F96E56812A6C09D2DA /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
62+
043F1D6415A9A5BC7A90DF71 /* Pods_INSPhotoGallery.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_INSPhotoGallery.framework; sourceTree = BUILT_PRODUCTS_DIR; };
63+
46019318530834A492BDDA22 /* Pods-INSPhotoGallery.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-INSPhotoGallery.debug.xcconfig"; path = "Pods/Target Support Files/Pods-INSPhotoGallery/Pods-INSPhotoGallery.debug.xcconfig"; sourceTree = "<group>"; };
6364
642427261CDE10740037E8DA /* INSPhotoGalleryFramework.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = INSPhotoGalleryFramework.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6465
642427281CDE10750037E8DA /* INSPhotoGalleryFramework.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = INSPhotoGalleryFramework.h; sourceTree = "<group>"; };
6566
6424272A1CDE10750037E8DA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -73,7 +74,7 @@
7374
6424273A1CDE10970037E8DA /* INSPhotoViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = INSPhotoViewController.swift; path = ../../INSPhotoGallery/INSPhotoViewController.swift; sourceTree = "<group>"; };
7475
6424273B1CDE10970037E8DA /* INSScalingImageView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = INSScalingImageView.swift; path = ../../INSPhotoGallery/INSScalingImageView.swift; sourceTree = "<group>"; };
7576
6424273C1CDE10970037E8DA /* UIVIew+INSPhotoViewer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "UIVIew+INSPhotoViewer.swift"; path = "../../INSPhotoGallery/UIVIew+INSPhotoViewer.swift"; sourceTree = "<group>"; };
76-
7E0A6F9305E2B70C9951142C /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
77+
A122ACF7A5F3C75B8FB59EED /* Pods-INSPhotoGallery.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-INSPhotoGallery.release.xcconfig"; path = "Pods/Target Support Files/Pods-INSPhotoGallery/Pods-INSPhotoGallery.release.xcconfig"; sourceTree = "<group>"; };
7778
BFDCCEF4783A040A397D6717 /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7879
D2EF35F11CB288F300033131 /* INSPhotoGallery.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = INSPhotoGallery.app; sourceTree = BUILT_PRODUCTS_DIR; };
7980
D2EF35F41CB288F300033131 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -103,7 +104,7 @@
103104
buildActionMask = 2147483647;
104105
files = (
105106
6424272D1CDE10750037E8DA /* INSPhotoGalleryFramework.framework in Frameworks */,
106-
CC2C6F6CFCB580C59030916E /* Pods.framework in Frameworks */,
107+
FB44620B1AE393EEB9BC3649 /* Pods_INSPhotoGallery.framework in Frameworks */,
107108
);
108109
runOnlyForDeploymentPostprocessing = 0;
109110
};
@@ -133,15 +134,16 @@
133134
isa = PBXGroup;
134135
children = (
135136
BFDCCEF4783A040A397D6717 /* Pods.framework */,
137+
043F1D6415A9A5BC7A90DF71 /* Pods_INSPhotoGallery.framework */,
136138
);
137139
name = Frameworks;
138140
sourceTree = "<group>";
139141
};
140-
7DC0C144B365E6A5E04F8728 /* Pods */ = {
142+
B884F781A6C59E9DC8012C7C /* Pods */ = {
141143
isa = PBXGroup;
142144
children = (
143-
52DA31F96E56812A6C09D2DA /* Pods.debug.xcconfig */,
144-
7E0A6F9305E2B70C9951142C /* Pods.release.xcconfig */,
145+
46019318530834A492BDDA22 /* Pods-INSPhotoGallery.debug.xcconfig */,
146+
A122ACF7A5F3C75B8FB59EED /* Pods-INSPhotoGallery.release.xcconfig */,
145147
);
146148
name = Pods;
147149
sourceTree = "<group>";
@@ -152,8 +154,8 @@
152154
D2EF35F31CB288F300033131 /* INSPhotoGallery */,
153155
642427271CDE10750037E8DA /* INSPhotoGalleryFramework */,
154156
D2EF35F21CB288F300033131 /* Products */,
155-
7DC0C144B365E6A5E04F8728 /* Pods */,
156157
6C22ABAEE0CC1A71AB7B6AF8 /* Frameworks */,
158+
B884F781A6C59E9DC8012C7C /* Pods */,
157159
);
158160
sourceTree = "<group>";
159161
};
@@ -229,13 +231,13 @@
229231
isa = PBXNativeTarget;
230232
buildConfigurationList = D2EF36031CB288F300033131 /* Build configuration list for PBXNativeTarget "INSPhotoGallery" */;
231233
buildPhases = (
232-
FFD481CC20A7D03E3BFD0A9D /* Check Pods Manifest.lock */,
234+
430D737234B234F1BDA3BFFA /* [CP] Check Pods Manifest.lock */,
233235
D2EF35ED1CB288F300033131 /* Sources */,
234236
D2EF35EE1CB288F300033131 /* Frameworks */,
235237
D2EF35EF1CB288F300033131 /* Resources */,
236-
295459D9D817169DE522A196 /* Embed Pods Frameworks */,
237-
C73ED651E9AE9BCD968CB264 /* Copy Pods Resources */,
238238
642427321CDE10750037E8DA /* Embed Frameworks */,
239+
AD54B7D6CFDA54F486B6350B /* [CP] Embed Pods Frameworks */,
240+
17D7FE4374E94EE2F6A42339 /* [CP] Copy Pods Resources */,
239241
);
240242
buildRules = (
241243
);
@@ -254,14 +256,16 @@
254256
isa = PBXProject;
255257
attributes = {
256258
LastSwiftUpdateCheck = 0730;
257-
LastUpgradeCheck = 0730;
259+
LastUpgradeCheck = 0800;
258260
ORGANIZATIONNAME = "Inspace Labs Sp z o. o. Spółka Komandytowa";
259261
TargetAttributes = {
260262
642427251CDE10740037E8DA = {
261263
CreatedOnToolsVersion = 7.3.1;
264+
LastSwiftMigration = 0800;
262265
};
263266
D2EF35F01CB288F300033131 = {
264267
CreatedOnToolsVersion = 7.3;
268+
LastSwiftMigration = 0800;
265269
};
266270
};
267271
};
@@ -307,49 +311,49 @@
307311
/* End PBXResourcesBuildPhase section */
308312

309313
/* Begin PBXShellScriptBuildPhase section */
310-
295459D9D817169DE522A196 /* Embed Pods Frameworks */ = {
314+
17D7FE4374E94EE2F6A42339 /* [CP] Copy Pods Resources */ = {
311315
isa = PBXShellScriptBuildPhase;
312316
buildActionMask = 2147483647;
313317
files = (
314318
);
315319
inputPaths = (
316320
);
317-
name = "Embed Pods Frameworks";
321+
name = "[CP] Copy Pods Resources";
318322
outputPaths = (
319323
);
320324
runOnlyForDeploymentPostprocessing = 0;
321325
shellPath = /bin/sh;
322-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
326+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-INSPhotoGallery/Pods-INSPhotoGallery-resources.sh\"\n";
323327
showEnvVarsInLog = 0;
324328
};
325-
C73ED651E9AE9BCD968CB264 /* Copy Pods Resources */ = {
329+
430D737234B234F1BDA3BFFA /* [CP] Check Pods Manifest.lock */ = {
326330
isa = PBXShellScriptBuildPhase;
327331
buildActionMask = 2147483647;
328332
files = (
329333
);
330334
inputPaths = (
331335
);
332-
name = "Copy Pods Resources";
336+
name = "[CP] Check Pods Manifest.lock";
333337
outputPaths = (
334338
);
335339
runOnlyForDeploymentPostprocessing = 0;
336340
shellPath = /bin/sh;
337-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
341+
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
338342
showEnvVarsInLog = 0;
339343
};
340-
FFD481CC20A7D03E3BFD0A9D /* Check Pods Manifest.lock */ = {
344+
AD54B7D6CFDA54F486B6350B /* [CP] Embed Pods Frameworks */ = {
341345
isa = PBXShellScriptBuildPhase;
342346
buildActionMask = 2147483647;
343347
files = (
344348
);
345349
inputPaths = (
346350
);
347-
name = "Check Pods Manifest.lock";
351+
name = "[CP] Embed Pods Frameworks";
348352
outputPaths = (
349353
);
350354
runOnlyForDeploymentPostprocessing = 0;
351355
shellPath = /bin/sh;
352-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
356+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-INSPhotoGallery/Pods-INSPhotoGallery-frameworks.sh\"\n";
353357
showEnvVarsInLog = 0;
354358
};
355359
/* End PBXShellScriptBuildPhase section */
@@ -419,6 +423,7 @@
419423
isa = XCBuildConfiguration;
420424
buildSettings = {
421425
CLANG_ENABLE_MODULES = YES;
426+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
422427
CURRENT_PROJECT_VERSION = 1;
423428
DEFINES_MODULE = YES;
424429
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -432,6 +437,7 @@
432437
PRODUCT_NAME = "$(TARGET_NAME)";
433438
SKIP_INSTALL = YES;
434439
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
440+
SWIFT_VERSION = 3.0;
435441
TARGETED_DEVICE_FAMILY = "1,2";
436442
VERSIONING_SYSTEM = "apple-generic";
437443
VERSION_INFO_PREFIX = "";
@@ -442,6 +448,7 @@
442448
isa = XCBuildConfiguration;
443449
buildSettings = {
444450
CLANG_ENABLE_MODULES = YES;
451+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
445452
CURRENT_PROJECT_VERSION = 1;
446453
DEFINES_MODULE = YES;
447454
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -454,6 +461,7 @@
454461
PRODUCT_BUNDLE_IDENTIFIER = io.inspace.INSPhotoGalleryFramework;
455462
PRODUCT_NAME = "$(TARGET_NAME)";
456463
SKIP_INSTALL = YES;
464+
SWIFT_VERSION = 3.0;
457465
TARGETED_DEVICE_FAMILY = "1,2";
458466
VERSIONING_SYSTEM = "apple-generic";
459467
VERSION_INFO_PREFIX = "";
@@ -474,8 +482,10 @@
474482
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
475483
CLANG_WARN_EMPTY_BODY = YES;
476484
CLANG_WARN_ENUM_CONVERSION = YES;
485+
CLANG_WARN_INFINITE_RECURSION = YES;
477486
CLANG_WARN_INT_CONVERSION = YES;
478487
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
488+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
479489
CLANG_WARN_UNREACHABLE_CODE = YES;
480490
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
481491
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -519,8 +529,10 @@
519529
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
520530
CLANG_WARN_EMPTY_BODY = YES;
521531
CLANG_WARN_ENUM_CONVERSION = YES;
532+
CLANG_WARN_INFINITE_RECURSION = YES;
522533
CLANG_WARN_INT_CONVERSION = YES;
523534
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
535+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
524536
CLANG_WARN_UNREACHABLE_CODE = YES;
525537
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
526538
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -539,37 +551,40 @@
539551
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
540552
MTL_ENABLE_DEBUG_INFO = NO;
541553
SDKROOT = iphoneos;
554+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
542555
VALIDATE_PRODUCT = YES;
543556
};
544557
name = Release;
545558
};
546559
D2EF36041CB288F300033131 /* Debug */ = {
547560
isa = XCBuildConfiguration;
548-
baseConfigurationReference = 52DA31F96E56812A6C09D2DA /* Pods.debug.xcconfig */;
561+
baseConfigurationReference = 46019318530834A492BDDA22 /* Pods-INSPhotoGallery.debug.xcconfig */;
549562
buildSettings = {
563+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
550564
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
551-
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
552565
INFOPLIST_FILE = INSPhotoGallery/Info.plist;
553566
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
554567
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
555568
PRODUCT_BUNDLE_IDENTIFIER = io.inspace.INSPhotoGallery;
556569
PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)_Example";
557570
PRODUCT_NAME = "$(TARGET_NAME)";
571+
SWIFT_VERSION = 3.0;
558572
};
559573
name = Debug;
560574
};
561575
D2EF36051CB288F300033131 /* Release */ = {
562576
isa = XCBuildConfiguration;
563-
baseConfigurationReference = 7E0A6F9305E2B70C9951142C /* Pods.release.xcconfig */;
577+
baseConfigurationReference = A122ACF7A5F3C75B8FB59EED /* Pods-INSPhotoGallery.release.xcconfig */;
564578
buildSettings = {
579+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
565580
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
566-
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
567581
INFOPLIST_FILE = INSPhotoGallery/Info.plist;
568582
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
569583
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
570584
PRODUCT_BUNDLE_IDENTIFIER = io.inspace.INSPhotoGallery;
571585
PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)_Example";
572586
PRODUCT_NAME = "$(TARGET_NAME)";
587+
SWIFT_VERSION = 3.0;
573588
};
574589
name = Release;
575590
};

‎Example/INSPhotoGallery/AppDelegate.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,30 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1414
var window: UIWindow?
1515

1616

17-
func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
17+
private func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: Any]?) -> Bool {
1818
// Override point for customization after application launch.
1919
return true
2020
}
2121

22-
func applicationWillResignActive(application: UIApplication) {
22+
func applicationWillResignActive(_ application: UIApplication) {
2323
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
2424
// Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
2525
}
2626

27-
func applicationDidEnterBackground(application: UIApplication) {
27+
func applicationDidEnterBackground(_ application: UIApplication) {
2828
// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
2929
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
3030
}
3131

32-
func applicationWillEnterForeground(application: UIApplication) {
32+
func applicationWillEnterForeground(_ application: UIApplication) {
3333
// Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
3434
}
3535

36-
func applicationDidBecomeActive(application: UIApplication) {
36+
func applicationDidBecomeActive(_ application: UIApplication) {
3737
// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
3838
}
3939

40-
func applicationWillTerminate(application: UIApplication) {
40+
func applicationWillTerminate(_ application: UIApplication) {
4141
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
4242
}
4343

0 commit comments

Comments
 (0)