Skip to content

Commit 613c9db

Browse files
authored
Merge pull request #1 from JettF/feature/swift3-migration
Feature/swift3 migration
2 parents 223e4c0 + 1b5ac69 commit 613c9db

File tree

123 files changed

+3634
-2293
lines changed

Some content is hidden

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

123 files changed

+3634
-2293
lines changed

Example/AMResizingTextView.xcodeproj/project.pbxproj

+74-60
Large diffs are not rendered by default.

Example/AMResizingTextView.xcodeproj/xcshareddata/xcschemes/AMResizingTextView-Example.xcscheme

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0630"
3+
LastUpgradeVersion = "0800"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -37,10 +37,10 @@
3737
</BuildActionEntries>
3838
</BuildAction>
3939
<TestAction
40+
buildConfiguration = "Debug"
4041
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4142
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
42-
shouldUseLaunchSchemeArgsEnv = "YES"
43-
buildConfiguration = "Debug">
43+
shouldUseLaunchSchemeArgsEnv = "YES">
4444
<Testables>
4545
<TestableReference
4646
skipped = "NO">
@@ -62,15 +62,18 @@
6262
ReferencedContainer = "container:AMResizingTextView.xcodeproj">
6363
</BuildableReference>
6464
</MacroExpansion>
65+
<AdditionalOptions>
66+
</AdditionalOptions>
6567
</TestAction>
6668
<LaunchAction
69+
buildConfiguration = "Debug"
6770
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
6871
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
6972
launchStyle = "0"
7073
useCustomWorkingDirectory = "NO"
71-
buildConfiguration = "Debug"
7274
ignoresPersistentStateOnLaunch = "NO"
7375
debugDocumentVersioning = "YES"
76+
debugServiceExtension = "internal"
7477
allowLocationSimulation = "YES">
7578
<BuildableProductRunnable
7679
runnableDebuggingMode = "0">
@@ -86,10 +89,10 @@
8689
</AdditionalOptions>
8790
</LaunchAction>
8891
<ProfileAction
92+
buildConfiguration = "Release"
8993
shouldUseLaunchSchemeArgsEnv = "YES"
9094
savedToolIdentifier = ""
9195
useCustomWorkingDirectory = "NO"
92-
buildConfiguration = "Release"
9396
debugDocumentVersioning = "YES">
9497
<BuildableProductRunnable
9598
runnableDebuggingMode = "0">

Example/AMResizingTextView/AppDelegate.swift

+7-6
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,31 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1414
var window: UIWindow?
1515

1616

17-
func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
17+
func application(_ application: UIApplication,
18+
didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool {
1819
// Override point for customization after application launch.
1920
return true
2021
}
2122

22-
func applicationWillResignActive(application: UIApplication) {
23+
func applicationWillResignActive(_ application: UIApplication) {
2324
// 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.
2425
// 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.
2526
}
2627

27-
func applicationDidEnterBackground(application: UIApplication) {
28+
func applicationDidEnterBackground(_ application: UIApplication) {
2829
// 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.
2930
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
3031
}
3132

32-
func applicationWillEnterForeground(application: UIApplication) {
33+
func applicationWillEnterForeground(_ application: UIApplication) {
3334
// 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.
3435
}
3536

36-
func applicationDidBecomeActive(application: UIApplication) {
37+
func applicationDidBecomeActive(_ application: UIApplication) {
3738
// 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.
3839
}
3940

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

Example/AMResizingTextView/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>$(EXECUTABLE_NAME)</string>
99
<key>CFBundleIdentifier</key>
10-
<string>org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>

Example/Podfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
source 'https://github.com/CocoaPods/Specs.git'
22
use_frameworks!
33

4-
target 'AMResizingTextView_Example', :exclusive => true do
5-
pod "AMResizingTextView", :path => "../"
6-
end
4+
abstract_target 'AMResizingTextView_Abstract_Target' do
5+
pod "AMResizingTextView", :path => "../"
76

8-
target 'AMResizingTextView_Tests', :exclusive => true do
9-
pod "AMResizingTextView", :path => "../"
7+
target 'AMResizingTextView_Example' do
8+
end
109

11-
pod 'Nimble', '~> 3.0'
12-
10+
target 'AMResizingTextView_Tests' do
11+
pod 'Nimble', :git => 'https://github.com/Quick/Nimble', :branch => 'swift-3.0'
12+
end
1313
end

Example/Podfile.lock

+15-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,27 @@
11
PODS:
22
- AMResizingTextView (0.1.0)
3-
- Nimble (3.0.0)
3+
- Nimble (5.0.0-alpha.30p1)
44

55
DEPENDENCIES:
66
- AMResizingTextView (from `../`)
7-
- Nimble (~> 3.0)
7+
- Nimble (from `https://github.com/Quick/Nimble`, branch `swift-3.0`)
88

99
EXTERNAL SOURCES:
1010
AMResizingTextView:
1111
:path: "../"
12+
Nimble:
13+
:branch: swift-3.0
14+
:git: https://github.com/Quick/Nimble
15+
16+
CHECKOUT OPTIONS:
17+
Nimble:
18+
:commit: 220152be528dcc0537764c179c95b8174028c80c
19+
:git: https://github.com/Quick/Nimble
1220

1321
SPEC CHECKSUMS:
14-
AMResizingTextView: c88313311a896c1b3b2c7a5e4886aa8ba4b74129
15-
Nimble: 4c353d43735b38b545cbb4cb91504588eb5de926
22+
AMResizingTextView: e404e9e37759ead1fe8d7c1ead70383554c402d8
23+
Nimble: c5b995b4cd57789ec44b0cfb79640fc00e61a8c7
24+
25+
PODFILE CHECKSUM: 99dd35b0c2d82044b664d1d1aca7bdc96c22ba53
1626

17-
COCOAPODS: 0.39.0
27+
COCOAPODS: 1.0.1

Example/Pods/Headers/Private/Nimble/DSL.h

-1
This file was deleted.

Example/Pods/Headers/Private/Nimble/NMBExceptionCapture.h

-1
This file was deleted.

Example/Pods/Headers/Private/Nimble/Nimble.h

-1
This file was deleted.

Example/Pods/Local Podspecs/AMResizingTextView.podspec.json

+6-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Local Podspecs/Nimble.podspec.json

+31
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Manifest.lock

+15-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/Nimble/Nimble/Adapters/NimbleXCTestHandler.swift

-40
This file was deleted.

Example/Pods/Nimble/Nimble/DSL+Wait.swift

-43
This file was deleted.

Example/Pods/Nimble/Nimble/DSL.swift

-32
This file was deleted.

0 commit comments

Comments
 (0)