Skip to content

Commit df9fcbc

Browse files
committed
swift 5
1 parent 58b867b commit df9fcbc

File tree

9 files changed

+47
-17
lines changed

9 files changed

+47
-17
lines changed

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.2
1+
5.0

Example/Assets.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"images" : [
3+
{
4+
"idiom" : "iphone",
5+
"size" : "20x20",
6+
"scale" : "2x"
7+
},
8+
{
9+
"idiom" : "iphone",
10+
"size" : "20x20",
11+
"scale" : "3x"
12+
},
313
{
414
"idiom" : "iphone",
515
"size" : "29x29",
@@ -30,6 +40,16 @@
3040
"size" : "60x60",
3141
"scale" : "3x"
3242
},
43+
{
44+
"idiom" : "ipad",
45+
"size" : "20x20",
46+
"scale" : "1x"
47+
},
48+
{
49+
"idiom" : "ipad",
50+
"size" : "20x20",
51+
"scale" : "2x"
52+
},
3353
{
3454
"idiom" : "ipad",
3555
"size" : "29x29",
@@ -64,6 +84,11 @@
6484
"idiom" : "ipad",
6585
"size" : "83.5x83.5",
6686
"scale" : "2x"
87+
},
88+
{
89+
"idiom" : "ios-marketing",
90+
"size" : "1024x1024",
91+
"scale" : "1x"
6792
}
6893
],
6994
"info" : {

Example/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
<key>CFBundlePackageType</key>
1616
<string>APPL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.9</string>
18+
<string>3.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>20</string>
22+
<string>21</string>
2323
<key>LSRequiresIPhoneOS</key>
2424
<true/>
2525
<key>UILaunchStoryboardName</key>

TBEmptyDataSet.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22

33
s.name = "TBEmptyDataSet"
4-
s.version = "2.9"
4+
s.version = "3.0"
55
s.summary = "An extension of UITableView/UICollectionView's super class, it will display a placeholder when the data is empty."
66

77
s.homepage = "https://github.com/teambition/TBEmptyDataSet"

TBEmptyDataSet.xcodeproj/project.pbxproj

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,21 +110,22 @@
110110
D33C7C5E1C44DBED00E1687A /* Project object */ = {
111111
isa = PBXProject;
112112
attributes = {
113-
LastUpgradeCheck = 0930;
113+
LastUpgradeCheck = 1020;
114114
ORGANIZATIONNAME = Teambition;
115115
TargetAttributes = {
116116
D33C7C661C44DBED00E1687A = {
117117
CreatedOnToolsVersion = 7.2;
118-
LastSwiftMigration = 0800;
118+
LastSwiftMigration = 1020;
119119
};
120120
};
121121
};
122122
buildConfigurationList = D33C7C611C44DBED00E1687A /* Build configuration list for PBXProject "TBEmptyDataSet" */;
123123
compatibilityVersion = "Xcode 3.2";
124-
developmentRegion = English;
124+
developmentRegion = en;
125125
hasScannedForEncodings = 0;
126126
knownRegions = (
127127
en,
128+
Base,
128129
);
129130
mainGroup = D33C7C5D1C44DBED00E1687A;
130131
productRefGroup = D33C7C681C44DBED00E1687A /* Products */;
@@ -166,6 +167,7 @@
166167
isa = XCBuildConfiguration;
167168
buildSettings = {
168169
ALWAYS_SEARCH_USER_PATHS = NO;
170+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
169171
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
170172
CLANG_CXX_LIBRARY = "libc++";
171173
CLANG_ENABLE_MODULES = YES;
@@ -224,6 +226,7 @@
224226
isa = XCBuildConfiguration;
225227
buildSettings = {
226228
ALWAYS_SEARCH_USER_PATHS = NO;
229+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
227230
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
228231
CLANG_CXX_LIBRARY = "libc++";
229232
CLANG_ENABLE_MODULES = YES;
@@ -289,7 +292,7 @@
289292
PRODUCT_NAME = "$(TARGET_NAME)";
290293
SKIP_INSTALL = YES;
291294
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
292-
SWIFT_VERSION = 4.2;
295+
SWIFT_VERSION = 5.0;
293296
};
294297
name = Debug;
295298
};
@@ -309,7 +312,7 @@
309312
PRODUCT_BUNDLE_IDENTIFIER = Teambition.TBEmptyDataSet;
310313
PRODUCT_NAME = "$(TARGET_NAME)";
311314
SKIP_INSTALL = YES;
312-
SWIFT_VERSION = 4.2;
315+
SWIFT_VERSION = 5.0;
313316
};
314317
name = Release;
315318
};

TBEmptyDataSet.xcodeproj/xcshareddata/xcschemes/TBEmptyDataSet.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 = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

TBEmptyDataSet/Supporting Files/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>2.9</string>
18+
<string>3.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

TBEmptyDataSetExample.xcodeproj/project.pbxproj

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,18 +115,18 @@
115115
isa = PBXProject;
116116
attributes = {
117117
LastSwiftUpdateCheck = 0710;
118-
LastUpgradeCheck = 0930;
118+
LastUpgradeCheck = 1020;
119119
ORGANIZATIONNAME = Teambition;
120120
TargetAttributes = {
121121
D3565A9E1BFD9449002CFA16 = {
122122
CreatedOnToolsVersion = 7.1.1;
123-
LastSwiftMigration = 0800;
123+
LastSwiftMigration = 1020;
124124
};
125125
};
126126
};
127127
buildConfigurationList = D3565A9A1BFD9449002CFA16 /* Build configuration list for PBXProject "TBEmptyDataSetExample" */;
128128
compatibilityVersion = "Xcode 3.2";
129-
developmentRegion = English;
129+
developmentRegion = en;
130130
hasScannedForEncodings = 0;
131131
knownRegions = (
132132
en,
@@ -200,6 +200,7 @@
200200
isa = XCBuildConfiguration;
201201
buildSettings = {
202202
ALWAYS_SEARCH_USER_PATHS = NO;
203+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
203204
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
204205
CLANG_CXX_LIBRARY = "libc++";
205206
CLANG_ENABLE_MODULES = YES;
@@ -255,6 +256,7 @@
255256
isa = XCBuildConfiguration;
256257
buildSettings = {
257258
ALWAYS_SEARCH_USER_PATHS = NO;
259+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
258260
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
259261
CLANG_CXX_LIBRARY = "libc++";
260262
CLANG_ENABLE_MODULES = YES;
@@ -309,7 +311,7 @@
309311
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
310312
PRODUCT_BUNDLE_IDENTIFIER = Teambition.TBEmptyDataSetExample;
311313
PRODUCT_NAME = TBEmptyDataSetExample;
312-
SWIFT_VERSION = 4.2;
314+
SWIFT_VERSION = 5.0;
313315
};
314316
name = Debug;
315317
};
@@ -322,7 +324,7 @@
322324
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
323325
PRODUCT_BUNDLE_IDENTIFIER = Teambition.TBEmptyDataSetExample;
324326
PRODUCT_NAME = TBEmptyDataSetExample;
325-
SWIFT_VERSION = 4.2;
327+
SWIFT_VERSION = 5.0;
326328
};
327329
name = Release;
328330
};

TBEmptyDataSetExample.xcodeproj/xcuserdata/hongxin.xcuserdatad/xcschemes/TBEmptyDataSetExample.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 = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)