Skip to content

Commit 1dd55e5

Browse files
author
TBXark
committed
support swift3.0
1 parent f8cf805 commit 1dd55e5

File tree

12 files changed

+101
-89
lines changed

12 files changed

+101
-89
lines changed

‎README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
## Requirements
1515

1616
- iOS 8.0+
17-
- Xcode 7.3
17+
- Xcode 8.0
18+
- Swift 3.0
1819

1920
## Installation
2021

@@ -104,6 +105,9 @@ protocol TKRadarChartDelegate: class {
104105

105106
## Release History
106107

108+
* 1.3.0
109+
Support swift 3.0
110+
107111
* 1.0.1
108112
Complete basic functions, add Cocoapod and Carthage support
109113

‎TKRadarChart iOS/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.0</string>
18+
<string>1.3.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

‎TKRadarChart.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "TKRadarChart"
3-
s.version = "1.0.2"
3+
s.version = "1.3.0"
44
s.summary = "TKRadarChart is a customizable radar chart "
55
s.license = { :type => 'MIT License', :file => 'LICENSE' } # 协议
66
s.homepage = "https://github.com/TBXark/TKRadarChart"

‎TKRadarChart.xcodeproj/project.pbxproj

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,14 +173,16 @@
173173
isa = PBXProject;
174174
attributes = {
175175
LastSwiftUpdateCheck = 0730;
176-
LastUpgradeCheck = 0730;
176+
LastUpgradeCheck = 0800;
177177
ORGANIZATIONNAME = Tbxark;
178178
TargetAttributes = {
179179
6A9103E21D538CA30009451B = {
180180
CreatedOnToolsVersion = 7.3.1;
181+
LastSwiftMigration = 0800;
181182
};
182183
6AA47F0E1D35FD3100C5D61F = {
183184
CreatedOnToolsVersion = 7.3.1;
185+
LastSwiftMigration = 0800;
184186
};
185187
};
186188
};
@@ -275,6 +277,7 @@
275277
6A9103ED1D538CA40009451B /* Debug */ = {
276278
isa = XCBuildConfiguration;
277279
buildSettings = {
280+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
278281
CURRENT_PROJECT_VERSION = 1;
279282
DEFINES_MODULE = YES;
280283
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -287,6 +290,7 @@
287290
PRODUCT_BUNDLE_IDENTIFIER = "TBXark.TKRadarChart-iOS";
288291
PRODUCT_NAME = TKRadarChart;
289292
SKIP_INSTALL = YES;
293+
SWIFT_VERSION = 3.0;
290294
VERSIONING_SYSTEM = "apple-generic";
291295
VERSION_INFO_PREFIX = "";
292296
};
@@ -295,6 +299,7 @@
295299
6A9103EE1D538CA40009451B /* Release */ = {
296300
isa = XCBuildConfiguration;
297301
buildSettings = {
302+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
298303
CURRENT_PROJECT_VERSION = 1;
299304
DEFINES_MODULE = YES;
300305
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -307,6 +312,7 @@
307312
PRODUCT_BUNDLE_IDENTIFIER = "TBXark.TKRadarChart-iOS";
308313
PRODUCT_NAME = TKRadarChart;
309314
SKIP_INSTALL = YES;
315+
SWIFT_VERSION = 3.0;
310316
VERSIONING_SYSTEM = "apple-generic";
311317
VERSION_INFO_PREFIX = "";
312318
};
@@ -326,8 +332,10 @@
326332
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
327333
CLANG_WARN_EMPTY_BODY = YES;
328334
CLANG_WARN_ENUM_CONVERSION = YES;
335+
CLANG_WARN_INFINITE_RECURSION = YES;
329336
CLANG_WARN_INT_CONVERSION = YES;
330337
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
338+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
331339
CLANG_WARN_UNREACHABLE_CODE = YES;
332340
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
333341
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -349,7 +357,7 @@
349357
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
350358
GCC_WARN_UNUSED_FUNCTION = YES;
351359
GCC_WARN_UNUSED_VARIABLE = YES;
352-
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
360+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
353361
MTL_ENABLE_DEBUG_INFO = YES;
354362
ONLY_ACTIVE_ARCH = YES;
355363
SDKROOT = iphoneos;
@@ -372,8 +380,10 @@
372380
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
373381
CLANG_WARN_EMPTY_BODY = YES;
374382
CLANG_WARN_ENUM_CONVERSION = YES;
383+
CLANG_WARN_INFINITE_RECURSION = YES;
375384
CLANG_WARN_INT_CONVERSION = YES;
376385
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
386+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
377387
CLANG_WARN_UNREACHABLE_CODE = YES;
378388
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
379389
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -389,9 +399,10 @@
389399
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
390400
GCC_WARN_UNUSED_FUNCTION = YES;
391401
GCC_WARN_UNUSED_VARIABLE = YES;
392-
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
402+
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
393403
MTL_ENABLE_DEBUG_INFO = NO;
394404
SDKROOT = iphoneos;
405+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
395406
TARGETED_DEVICE_FAMILY = "1,2";
396407
VALIDATE_PRODUCT = YES;
397408
};
@@ -400,26 +411,28 @@
400411
6AA47F221D35FD3100C5D61F /* Debug */ = {
401412
isa = XCBuildConfiguration;
402413
buildSettings = {
414+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
403415
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
404-
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
405416
INFOPLIST_FILE = TKRadarChart/Info.plist;
406417
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
407418
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
408419
PRODUCT_BUNDLE_IDENTIFIER = TBXark.TKRadarChart;
409420
PRODUCT_NAME = "$(TARGET_NAME)";
421+
SWIFT_VERSION = 3.0;
410422
};
411423
name = Debug;
412424
};
413425
6AA47F231D35FD3100C5D61F /* Release */ = {
414426
isa = XCBuildConfiguration;
415427
buildSettings = {
428+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
416429
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
417-
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
418430
INFOPLIST_FILE = TKRadarChart/Info.plist;
419431
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
420432
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
421433
PRODUCT_BUNDLE_IDENTIFIER = TBXark.TKRadarChart;
422434
PRODUCT_NAME = "$(TARGET_NAME)";
435+
SWIFT_VERSION = 3.0;
423436
};
424437
name = Release;
425438
};
@@ -433,6 +446,7 @@
433446
6A9103EE1D538CA40009451B /* Release */,
434447
);
435448
defaultConfigurationIsVisible = 0;
449+
defaultConfigurationName = Release;
436450
};
437451
6AA47F0A1D35FD3100C5D61F /* Build configuration list for PBXProject "TKRadarChart" */ = {
438452
isa = XCConfigurationList;

‎TKRadarChart.xcodeproj/xcuserdata/Tbxark.xcuserdatad/xcschemes/TKRadarChart iOS.xcscheme renamed to ‎TKRadarChart.xcodeproj/xcshareddata/xcschemes/TKRadarChart iOS.xcscheme

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0730"
3+
LastUpgradeVersion = "0800"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -15,7 +15,7 @@
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "6A9103E21D538CA30009451B"
18-
BuildableName = "TKRadarChart iOS.framework"
18+
BuildableName = "TKRadarChart.framework"
1919
BlueprintName = "TKRadarChart iOS"
2020
ReferencedContainer = "container:TKRadarChart.xcodeproj">
2121
</BuildableReference>
@@ -46,7 +46,7 @@
4646
<BuildableReference
4747
BuildableIdentifier = "primary"
4848
BlueprintIdentifier = "6A9103E21D538CA30009451B"
49-
BuildableName = "TKRadarChart iOS.framework"
49+
BuildableName = "TKRadarChart.framework"
5050
BlueprintName = "TKRadarChart iOS"
5151
ReferencedContainer = "container:TKRadarChart.xcodeproj">
5252
</BuildableReference>
@@ -64,7 +64,7 @@
6464
<BuildableReference
6565
BuildableIdentifier = "primary"
6666
BlueprintIdentifier = "6A9103E21D538CA30009451B"
67-
BuildableName = "TKRadarChart iOS.framework"
67+
BuildableName = "TKRadarChart.framework"
6868
BlueprintName = "TKRadarChart iOS"
6969
ReferencedContainer = "container:TKRadarChart.xcodeproj">
7070
</BuildableReference>

‎TKRadarChart.xcodeproj/xcshareddata/xcschemes/TKRadarChart-iOS.xcscheme renamed to ‎TKRadarChart.xcodeproj/xcshareddata/xcschemes/TKRadarChart.xcscheme

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0730"
3+
LastUpgradeVersion = "0800"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -14,9 +14,9 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "6A9103D41D538B560009451B"
17+
BlueprintIdentifier = "6A9103E21D538CA30009451B"
1818
BuildableName = "TKRadarChart.framework"
19-
BlueprintName = "TKRadarChart-iOS"
19+
BlueprintName = "TKRadarChart iOS"
2020
ReferencedContainer = "container:TKRadarChart.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
@@ -45,9 +45,9 @@
4545
<MacroExpansion>
4646
<BuildableReference
4747
BuildableIdentifier = "primary"
48-
BlueprintIdentifier = "6A9103D41D538B560009451B"
48+
BlueprintIdentifier = "6A9103E21D538CA30009451B"
4949
BuildableName = "TKRadarChart.framework"
50-
BlueprintName = "TKRadarChart-iOS"
50+
BlueprintName = "TKRadarChart iOS"
5151
ReferencedContainer = "container:TKRadarChart.xcodeproj">
5252
</BuildableReference>
5353
</MacroExpansion>
@@ -63,9 +63,9 @@
6363
<MacroExpansion>
6464
<BuildableReference
6565
BuildableIdentifier = "primary"
66-
BlueprintIdentifier = "6A9103D41D538B560009451B"
66+
BlueprintIdentifier = "6A9103E21D538CA30009451B"
6767
BuildableName = "TKRadarChart.framework"
68-
BlueprintName = "TKRadarChart-iOS"
68+
BlueprintName = "TKRadarChart iOS"
6969
ReferencedContainer = "container:TKRadarChart.xcodeproj">
7070
</BuildableReference>
7171
</MacroExpansion>

‎TKRadarChart.xcodeproj/xcuserdata/Tbxark.xcuserdatad/xcschemes/TKRadarChart.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0730"
3+
LastUpgradeVersion = "0800"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎TKRadarChart.xcodeproj/xcuserdata/Tbxark.xcuserdatad/xcschemes/xcschememanagement.plist

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,16 @@
44
<dict>
55
<key>SchemeUserState</key>
66
<dict>
7-
<key>TKRadarChart iOS.xcscheme</key>
7+
<key>TKRadarChart.xcscheme</key>
88
<dict>
99
<key>orderHint</key>
10-
<integer>2</integer>
10+
<integer>0</integer>
1111
</dict>
12-
<key>TKRadarChart-iOS.xcscheme_^#shared#^_</key>
12+
<key>TKRadarChart.xcscheme_^#shared#^_</key>
1313
<dict>
1414
<key>orderHint</key>
1515
<integer>1</integer>
1616
</dict>
17-
<key>TKRadarChart.xcscheme</key>
18-
<dict>
19-
<key>orderHint</key>
20-
<integer>0</integer>
21-
</dict>
2217
</dict>
2318
<key>SuppressBuildableAutocreation</key>
2419
<dict>

‎TKRadarChart/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: AnyObject]?) -> 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+
private 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+
private 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+
private 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+
private func applicationWillTerminate(application: UIApplication) {
4141
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
4242
}
4343

‎TKRadarChart/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>APPL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.0</string>
18+
<string>1.3.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

0 commit comments

Comments
 (0)