Skip to content

Commit 58dc457

Browse files
Updated UiView+nib: added generic type. Example project migrated to swift 5
1 parent 28589c0 commit 58dc457

File tree

9 files changed

+92
-90
lines changed

9 files changed

+92
-90
lines changed

Example/ORCommonUI-Swift.xcodeproj/project.pbxproj

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -220,12 +220,12 @@
220220
607FACCF1AFB9204008FA782 = {
221221
CreatedOnToolsVersion = 6.3.1;
222222
DevelopmentTeam = NWAXZVJAA5;
223-
LastSwiftMigration = 0930;
223+
LastSwiftMigration = 1110;
224224
};
225225
607FACE41AFB9204008FA782 = {
226226
CreatedOnToolsVersion = 6.3.1;
227227
DevelopmentTeam = NWAXZVJAA5;
228-
LastSwiftMigration = 0930;
228+
LastSwiftMigration = 1110;
229229
TestTargetID = 607FACCF1AFB9204008FA782;
230230
};
231231
};
@@ -235,6 +235,7 @@
235235
developmentRegion = English;
236236
hasScannedForEncodings = 0;
237237
knownRegions = (
238+
English,
238239
en,
239240
Base,
240241
);
@@ -450,7 +451,7 @@
450451
ONLY_ACTIVE_ARCH = YES;
451452
SDKROOT = iphoneos;
452453
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
453-
SWIFT_VERSION = 4.2;
454+
SWIFT_VERSION = 5.0;
454455
};
455456
name = Debug;
456457
};
@@ -498,7 +499,7 @@
498499
MTL_ENABLE_DEBUG_INFO = NO;
499500
SDKROOT = iphoneos;
500501
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
501-
SWIFT_VERSION = 4.2;
502+
SWIFT_VERSION = 5.0;
502503
VALIDATE_PRODUCT = YES;
503504
};
504505
name = Release;
@@ -515,7 +516,7 @@
515516
MODULE_NAME = ExampleApp;
516517
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
517518
PRODUCT_NAME = "$(TARGET_NAME)";
518-
SWIFT_VERSION = 4.2;
519+
SWIFT_VERSION = 5.0;
519520
};
520521
name = Debug;
521522
};
@@ -531,7 +532,7 @@
531532
MODULE_NAME = ExampleApp;
532533
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
533534
PRODUCT_NAME = "$(TARGET_NAME)";
534-
SWIFT_VERSION = 4.2;
535+
SWIFT_VERSION = 5.0;
535536
};
536537
name = Release;
537538
};
@@ -553,7 +554,7 @@
553554
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
554555
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
555556
PRODUCT_NAME = "$(TARGET_NAME)";
556-
SWIFT_VERSION = 4.2;
557+
SWIFT_VERSION = 5.0;
557558
};
558559
name = Debug;
559560
};
@@ -571,7 +572,7 @@
571572
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
572573
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
573574
PRODUCT_NAME = "$(TARGET_NAME)";
574-
SWIFT_VERSION = 4.2;
575+
SWIFT_VERSION = 5.0;
575576
};
576577
name = Release;
577578
};

Example/ORCommonUI-Swift/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1414
var window: UIWindow?
1515

1616

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

Example/Podfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- ORCommonUI-Swift (5.0.3):
2+
- ORCommonUI-Swift (5.0.4):
33
- PureLayout (~> 3.0)
44
- PureLayout (3.0.2)
55

@@ -15,9 +15,9 @@ EXTERNAL SOURCES:
1515
:path: "../"
1616

1717
SPEC CHECKSUMS:
18-
ORCommonUI-Swift: ed7f08885bd168f1bb539e5913b58fd2ffc0390f
18+
ORCommonUI-Swift: 6cc029c3bd02b700e6c375cb028087b858a92518
1919
PureLayout: 4d550abe49a94f24c2808b9b95db9131685fe4cd
2020

2121
PODFILE CHECKSUM: c1a7e4ec90bec821daefdc23706a32cb5e39369e
2222

23-
COCOAPODS: 1.8.0.beta.2
23+
COCOAPODS: 1.8.4

Example/Pods/Local Podspecs/ORCommonUI-Swift.podspec.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Manifest.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)