Skip to content

Commit 0109841

Browse files
thecatalinstanthecatalinstan
authored
Merge pull request #20 from thecatalinstan/release/0.5.2
Release/0.5.2
2 parents 4ebf00c + eacba57 commit 0109841

File tree

94 files changed

+290
-124
lines changed

Some content is hidden

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

94 files changed

+290
-124
lines changed

‎.travis.yml‎

Lines changed: 54 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,57 @@
11
osx_image: xcode9.3beta
22
language: objective-c
33
xcode_project: Criollo.xcodeproj
4-
xcode_scheme:
5-
- Criollo macOS
6-
- Criollo iOS
4+
5+
script:
6+
# Frameworks Build
7+
- xcodebuild clean build -quiet -project Criollo.xcodeproj -scheme "Criollo macOS" CODE_SIGNING_REQUIRED=NO
8+
- xcodebuild clean build -quiet -project Criollo.xcodeproj -scheme "Criollo iOS" CODE_SIGNING_REQUIRED=NO
9+
- xcodebuild clean build -quiet -project Criollo.xcodeproj -scheme "Criollo tvOS" CODE_SIGNING_REQUIRED=NO
10+
11+
# Frameworks Tests
12+
- xcodebuild clean test -quiet -project Criollo.xcodeproj -scheme "Criollo macOS" CODE_SIGNING_REQUIRED=NO
13+
- xcodebuild clean test -quiet -destination 'platform=iOS Simulator,name=iPhone X' -project Criollo.xcodeproj -scheme "Criollo iOS" CODE_SIGNING_REQUIRED=NO
14+
- xcodebuild clean test -quiet -destination 'platform=tvOS Simulator,name=Apple TV' -project Criollo.xcodeproj -scheme "Criollo tvOS" CODE_SIGNING_REQUIRED=NO
15+
16+
# Apps
17+
- xcodebuild clean build -quiet -project Criollo.xcodeproj -scheme "Criollo macOS App" CODE_SIGNING_REQUIRED=NO
18+
- xcodebuild clean build -quiet -project Criollo.xcodeproj -destination 'platform=iOS Simulator,name=iPhone X' -scheme "Criollo iOS App" CODE_SIGNING_REQUIRED=NO
19+
- xcodebuild clean build -quiet -project Criollo.xcodeproj -destination 'platform=tvOS Simulator,name=Apple TV' -scheme "Criollo tvOS App" CODE_SIGNING_REQUIRED=NO
20+
21+
# Examples
22+
# - cd Examples
23+
24+
# - cd HelloWorld
25+
# - pod install && xcodebuild clean build -quiet -workspace HelloWorld.xcworkspace -scheme "HelloWorld" CODE_SIGNING_REQUIRED=NO
26+
# - cd ../
27+
28+
# - cd HelloWorld-MultiTarget
29+
# - pod install && xcodebuild clean build -quiet -workspace HelloWorld.xcworkspace -scheme "HelloWorld" CODE_SIGNING_REQUIRED=NO
30+
# - pod install && xcodebuild clean build -quiet -workspace HelloWorld.xcworkspace -scheme "HelloWorld-Cocoa" CODE_SIGNING_REQUIRED=NO
31+
# - pod install && xcodebuild clean build -quiet -destination 'platform=iOS Simulator,name=iPhone X' -workspace HelloWorld.xcworkspace -scheme "HelloWorld-iOS" CODE_SIGNING_REQUIRED=NO
32+
# - pod install && xcodebuild clean build -quiet -destination 'platform=tvOS Simulator,name=Apple TV' -workspace HelloWorld.xcworkspace -scheme "HelloWorld-tvOS" CODE_SIGNING_REQUIRED=NO
33+
# - cd ../
34+
35+
# - cd HelloWorld-ObjC
36+
# - pod install && xcodebuild clean build -quiet -workspace HelloWorld-ObjC.xcworkspace -scheme "HelloWorld-ObjC" CODE_SIGNING_REQUIRED=NO
37+
# - cd ../
38+
39+
# - cd HelloWorld-Swift
40+
# - pod install && xcodebuild clean build -quiet -workspace HelloWorld-Swift.xcworkspace -scheme "HelloWorld-Swift" CODE_SIGNING_REQUIRED=NO
41+
# - cd ../
42+
43+
# - cd LongRequest
44+
# - pod install && xcodebuild clean build -quiet -workspace LongRequest.xcworkspace -scheme "LongRequest" CODE_SIGNING_REQUIRED=NO
45+
# - cd ../
46+
47+
# - cd SecureHTTPServer
48+
# - pod install && xcodebuild clean build -quiet -destination 'platform=iOS Simulator,name=iPhone X' -workspace SecureHTTPServer.xcworkspace -scheme "SecureHTTPServer" CODE_SIGNING_REQUIRED=NO
49+
# - cd ../
50+
51+
# - cd ServerStats
52+
# - pod install && xcodebuild clean build -quiet -workspace CriolloServerStats.xcworkspace -scheme "CriolloServerStats" CODE_SIGNING_REQUIRED=NO
53+
# - cd ../
54+
55+
# - cd ../
56+
57+

‎Criollo/Apps/Criollo iOS App.xcodeproj/project.pbxproj‎ renamed to ‎Apps/Criollo iOS App.xcodeproj/project.pbxproj‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
AD23B7361D3FC7100056170D /* MultiRouteViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MultiRouteViewController.swift; sourceTree = "<group>"; };
6464
AD23B7381D3FC71C0056170D /* MultiRouteViewController.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = MultiRouteViewController.html; path = Shared/MultiRouteViewController.html; sourceTree = SOURCE_ROOT; };
6565
AD41ECD11CB42D1C00133C8D /* style.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = style.css; sourceTree = "<group>"; };
66-
AD41ECDB1CB4330000133C8D /* CriolloiOSApp-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CriolloiOSApp-Bridging-Header.h"; sourceTree = "<group>"; };
66+
AD41ECDB1CB4330000133C8D /* Criollo-iOS-App-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Criollo-iOS-App-Bridging-Header.h"; sourceTree = "<group>"; };
6767
AD41ECDC1CB4330100133C8D /* SystemInfoHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SystemInfoHelper.h; path = Shared/SystemInfoHelper.h; sourceTree = SOURCE_ROOT; };
6868
AD41ECDD1CB4330100133C8D /* SystemInfoHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SystemInfoHelper.m; path = Shared/SystemInfoHelper.m; sourceTree = SOURCE_ROOT; };
6969
AD554DA01CAC9A95002182A4 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -115,7 +115,7 @@
115115
AD5B3C481CA820B5000988B7 = {
116116
isa = PBXGroup;
117117
children = (
118-
AD5B3C531CA820B5000988B7 /* CriolloiOSApp */,
118+
AD5B3C531CA820B5000988B7 /* Criollo iOS App */,
119119
AD5B3C521CA820B5000988B7 /* Products */,
120120
ADAD526A1D3E4F0400DDFBB5 /* Frameworks */,
121121
);
@@ -129,7 +129,7 @@
129129
name = Products;
130130
sourceTree = "<group>";
131131
};
132-
AD5B3C531CA820B5000988B7 /* CriolloiOSApp */ = {
132+
AD5B3C531CA820B5000988B7 /* Criollo iOS App */ = {
133133
isa = PBXGroup;
134134
children = (
135135
AD5B3C541CA820B5000988B7 /* AppDelegate.swift */,
@@ -143,13 +143,13 @@
143143
AD5B3C5D1CA820B5000988B7 /* LaunchScreen.storyboard */,
144144
AD5B3C601CA820B5000988B7 /* Info.plist */,
145145
AD554DA01CAC9A95002182A4 /* Assets.xcassets */,
146-
AD41ECDB1CB4330000133C8D /* CriolloiOSApp-Bridging-Header.h */,
146+
AD41ECDB1CB4330000133C8D /* Criollo-iOS-App-Bridging-Header.h */,
147147
AD41ECDC1CB4330100133C8D /* SystemInfoHelper.h */,
148148
AD41ECDD1CB4330100133C8D /* SystemInfoHelper.m */,
149149
4AF762281F93C4A80061EFC9 /* Certificates */,
150150
AD41ECD01CB42D1C00133C8D /* Public */,
151151
);
152-
path = CriolloiOSApp;
152+
path = "Criollo iOS App";
153153
sourceTree = "<group>";
154154
};
155155
ADAD526A1D3E4F0400DDFBB5 /* Frameworks */ = {
@@ -196,6 +196,7 @@
196196
CreatedOnToolsVersion = 7.3;
197197
DevelopmentTeam = JNX7A8G939;
198198
LastSwiftMigration = 0900;
199+
ProvisioningStyle = Manual;
199200
};
200201
};
201202
};
@@ -380,15 +381,15 @@
380381
buildSettings = {
381382
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
382383
CLANG_ENABLE_MODULES = YES;
383-
CODE_SIGN_IDENTITY = "iPhone Developer";
384-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
384+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
385+
CODE_SIGN_STYLE = Manual;
385386
ENABLE_BITCODE = NO;
386-
INFOPLIST_FILE = CriolloiOSApp/Info.plist;
387+
INFOPLIST_FILE = "Criollo iOS App/Info.plist";
387388
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
388389
PRODUCT_BUNDLE_IDENTIFIER = io.criollo.CriolloiOSApp;
389390
PRODUCT_NAME = "Criollo iOS App";
390391
PROVISIONING_PROFILE = "";
391-
SWIFT_OBJC_BRIDGING_HEADER = "CriolloiOSApp/CriolloiOSApp-Bridging-Header.h";
392+
SWIFT_OBJC_BRIDGING_HEADER = "Criollo iOS App/Criollo-iOS-App-Bridging-Header.h";
392393
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
393394
SWIFT_VERSION = 4.0;
394395
TARGETED_DEVICE_FAMILY = "1,2";
@@ -400,15 +401,15 @@
400401
buildSettings = {
401402
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
402403
CLANG_ENABLE_MODULES = YES;
403-
CODE_SIGN_IDENTITY = "iPhone Developer";
404-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
404+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
405+
CODE_SIGN_STYLE = Manual;
405406
ENABLE_BITCODE = NO;
406-
INFOPLIST_FILE = CriolloiOSApp/Info.plist;
407+
INFOPLIST_FILE = "Criollo iOS App/Info.plist";
407408
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
408409
PRODUCT_BUNDLE_IDENTIFIER = io.criollo.CriolloiOSApp;
409410
PRODUCT_NAME = "Criollo iOS App";
410411
PROVISIONING_PROFILE = "";
411-
SWIFT_OBJC_BRIDGING_HEADER = "CriolloiOSApp/CriolloiOSApp-Bridging-Header.h";
412+
SWIFT_OBJC_BRIDGING_HEADER = "Criollo iOS App/Criollo-iOS-App-Bridging-Header.h";
412413
SWIFT_VERSION = 4.0;
413414
TARGETED_DEVICE_FAMILY = "1,2";
414415
};

‎Criollo/Apps/Criollo iOS App.xcodeproj/xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist‎ renamed to ‎Apps/Criollo iOS App.xcodeproj/xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist‎

File renamed without changes.

‎Criollo/Apps/CriolloTVApp/APIController.swift‎ renamed to ‎Apps/Criollo iOS App/APIController.swift‎

File renamed without changes.

‎Criollo/Apps/CriolloiOSApp/AppDelegate.swift‎ renamed to ‎Apps/Criollo iOS App/AppDelegate.swift‎

File renamed without changes.

‎Criollo/Apps/CriolloiOSApp/Assets.xcassets/AppIcon.appiconset/Contents.json‎ renamed to ‎Apps/Criollo iOS App/Assets.xcassets/AppIcon.appiconset/Contents.json‎

File renamed without changes.

‎Criollo/Apps/CriolloiOSApp/Assets.xcassets/AppIcon.appiconset/New [email protected]‎ renamed to ‎Apps/Criollo iOS App/Assets.xcassets/AppIcon.appiconset/New [email protected]‎

File renamed without changes.

‎Criollo/Apps/CriolloiOSApp/Assets.xcassets/AppIcon.appiconset/New [email protected]‎ renamed to ‎Apps/Criollo iOS App/Assets.xcassets/AppIcon.appiconset/New [email protected]‎

File renamed without changes.

‎Criollo/Apps/CriolloiOSApp/Assets.xcassets/AppIcon.appiconset/New [email protected]‎ renamed to ‎Apps/Criollo iOS App/Assets.xcassets/AppIcon.appiconset/New [email protected]‎

File renamed without changes.

‎Criollo/Apps/CriolloiOSApp/Assets.xcassets/AppIcon.appiconset/New icon-76.png‎ renamed to ‎Apps/Criollo iOS App/Assets.xcassets/AppIcon.appiconset/New icon-76.png‎

File renamed without changes.

0 commit comments

Comments
 (0)