Skip to content

Commit 5f92ab4

Browse files
author
Luc Dion
authored
Merge pull request #92 from mirego/fastlane
Integrate Fastlane
2 parents 63fc8ef + 2df94f5 commit 5f92ab4

22 files changed

+251
-338
lines changed

‎.swiftlint.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ opt_in_rules: # some rules are only opt-in
33
- closure_spacing
44
- explicit_init
55
- nimble_operator
6-
- number_separator
76
- operator_usage_whitespace
87
- overridden_super_call
98
- private_outlet

‎.travis.yml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ osx_image: xcode9
44
env:
55
matrix:
66
- SCHEME=PinLayout SDK=iphonesimulator11.0
7-
- SCHEME=PinLayout SDK=iphonesimulator10.3
8-
- SCHEME=PinLayoutSample SDK=iphonesimulator11.0
9-
- SCHEME=PinLayoutTVOS SDK=appletvsimulator11.0
7+
#- SCHEME=PinLayout SDK=iphonesimulator10.3
8+
#- SCHEME=PinLayoutSample SDK=iphonesimulator11.0
9+
#- SCHEME=PinLayoutTVOS SDK=appletvsimulator11.0
1010

1111
before_install:
1212
# - brew outdated xctool || brew upgrade xctool;
@@ -19,15 +19,16 @@ script:
1919
- |
2020
if [[ $SCHEME = "PinLayout" ]]; then
2121
set -o pipefail && xcodebuild -workspace PinLayout.xcworkspace -scheme "$SCHEME" -sdk $SDK -destination 'platform=iOS Simulator,name=iPhone 6' -enableCodeCoverage YES build test | xcpretty -f `xcpretty-travis-formatter`
22+
bundle exec fastlane travis
2223
fi
2324
24-
if [[ $SCHEME = "PinLayoutSample" ]]; then
25-
set -o pipefail && xcodebuild -workspace PinLayout.xcworkspace -scheme "$SCHEME" -sdk $SDK -destination 'platform=iOS Simulator,name=iPhone 6' build | xcpretty -f `xcpretty-travis-formatter`
26-
fi
25+
#if [[ $SCHEME = "PinLayoutSample" ]]; then
26+
# set -o pipefail && xcodebuild -workspace PinLayout.xcworkspace -scheme "$SCHEME" -sdk $SDK -destination 'platform=iOS Simulator,name=iPhone 6' build | xcpretty -f `xcpretty-travis-formatter`
27+
#fi
2728
28-
if [[ $SCHEME = "PinLayoutTVOS" ]]; then
29-
set -o pipefail && xcodebuild -workspace PinLayout.xcworkspace -scheme "$SCHEME" -sdk $SDK -destination 'platform=tvOS Simulator,name=Apple TV 1080p' build | xcpretty -f `xcpretty-travis-formatter`
30-
fi
29+
#if [[ $SCHEME = "PinLayoutTVOS" ]]; then
30+
# set -o pipefail && xcodebuild -workspace PinLayout.xcworkspace -scheme "$SCHEME" -sdk $SDK -destination 'platform=tvOS Simulator,name=Apple TV 1080p' build | xcpretty -f `xcpretty-travis-formatter`
31+
#fi
3132
3233
after_success:
3334
- |

‎Example/PinLayoutSample.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 151 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
2439CC531E665C6B003326FB /* MultiRelativeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2439CC401E665C6B003326FB /* MultiRelativeViewController.swift */; };
1919
2439CC541E665C6B003326FB /* RelativeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2439CC411E665C6B003326FB /* RelativeView.swift */; };
2020
2439CC551E665C6B003326FB /* RelativeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2439CC421E665C6B003326FB /* RelativeViewController.swift */; };
21-
246812FD1F8D013500462E53 /* NotificationCenter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 246812FC1F8D013500462E53 /* NotificationCenter.framework */; };
22-
246813001F8D013500462E53 /* TodayViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 246812FF1F8D013500462E53 /* TodayViewController.swift */; };
23-
246813031F8D013500462E53 /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 246813011F8D013500462E53 /* MainInterface.storyboard */; };
24-
246813071F8D013500462E53 /* PinLayoutTodayExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 246812FB1F8D013500462E53 /* PinLayoutTodayExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
2521
247157941F87BD680003424F /* UIEdgeInsets+PinLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 247157931F87BD680003424F /* UIEdgeInsets+PinLayout.swift */; };
2622
249326891EEEEE3D00BCB814 /* Stylesheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 249326881EEEEE3D00BCB814 /* Stylesheet.swift */; };
2723
2493268C1EEEEFF100BCB814 /* BaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2493268B1EEEEFF100BCB814 /* BaseViewController.swift */; };
@@ -70,13 +66,6 @@
7066
remoteGlobalIDString = 249EFE791E64FB4C00165E39;
7167
remoteInfo = PinLayout;
7268
};
73-
246813051F8D013500462E53 /* PBXContainerItemProxy */ = {
74-
isa = PBXContainerItemProxy;
75-
containerPortal = 249EFE371E64FAFE00165E39 /* Project object */;
76-
proxyType = 1;
77-
remoteGlobalIDString = 246812FA1F8D013500462E53;
78-
remoteInfo = PinLayoutTodayExtension;
79-
};
8069
24DA374E1EF7F90700D1AB2F /* PBXContainerItemProxy */ = {
8170
isa = PBXContainerItemProxy;
8271
containerPortal = 2439CC1E1E665858003326FB /* PinLayout.xcodeproj */;
@@ -104,7 +93,6 @@
10493
dstPath = "";
10594
dstSubfolderSpec = 13;
10695
files = (
107-
246813071F8D013500462E53 /* PinLayoutTodayExtension.appex in Embed App Extensions */,
10896
);
10997
name = "Embed App Extensions";
11098
runOnlyForDeploymentPostprocessing = 0;
@@ -124,11 +112,7 @@
124112
2439CC401E665C6B003326FB /* MultiRelativeViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MultiRelativeViewController.swift; sourceTree = "<group>"; };
125113
2439CC411E665C6B003326FB /* RelativeView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RelativeView.swift; sourceTree = "<group>"; };
126114
2439CC421E665C6B003326FB /* RelativeViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RelativeViewController.swift; sourceTree = "<group>"; };
127-
246812FB1F8D013500462E53 /* PinLayoutTodayExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = PinLayoutTodayExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
128115
246812FC1F8D013500462E53 /* NotificationCenter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NotificationCenter.framework; path = System/Library/Frameworks/NotificationCenter.framework; sourceTree = SDKROOT; };
129-
246812FF1F8D013500462E53 /* TodayViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TodayViewController.swift; sourceTree = "<group>"; };
130-
246813021F8D013500462E53 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/MainInterface.storyboard; sourceTree = "<group>"; };
131-
246813041F8D013500462E53 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
132116
247157931F87BD680003424F /* UIEdgeInsets+PinLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIEdgeInsets+PinLayout.swift"; sourceTree = "<group>"; };
133117
249326881EEEEE3D00BCB814 /* Stylesheet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Stylesheet.swift; sourceTree = "<group>"; };
134118
2493268B1EEEEFF100BCB814 /* BaseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseViewController.swift; sourceTree = "<group>"; };
@@ -161,14 +145,6 @@
161145
/* End PBXFileReference section */
162146

163147
/* Begin PBXFrameworksBuildPhase section */
164-
246812F81F8D013500462E53 /* Frameworks */ = {
165-
isa = PBXFrameworksBuildPhase;
166-
buildActionMask = 2147483647;
167-
files = (
168-
246812FD1F8D013500462E53 /* NotificationCenter.framework in Frameworks */,
169-
);
170-
runOnlyForDeploymentPostprocessing = 0;
171-
};
172148
249EFE3C1E64FAFE00165E39 /* Frameworks */ = {
173149
isa = PBXFrameworksBuildPhase;
174150
buildActionMask = 2147483647;
@@ -288,16 +264,6 @@
288264
path = "Supporting Files";
289265
sourceTree = "<group>";
290266
};
291-
246812FE1F8D013500462E53 /* PinLayoutTodayExtension */ = {
292-
isa = PBXGroup;
293-
children = (
294-
246812FF1F8D013500462E53 /* TodayViewController.swift */,
295-
246813011F8D013500462E53 /* MainInterface.storyboard */,
296-
246813041F8D013500462E53 /* Info.plist */,
297-
);
298-
path = PinLayoutTodayExtension;
299-
sourceTree = "<group>";
300-
};
301267
2497CFEA1EF40B8100DFD13B /* Form */ = {
302268
isa = PBXGroup;
303269
children = (
@@ -310,7 +276,6 @@
310276
249EFE361E64FAFE00165E39 = {
311277
isa = PBXGroup;
312278
children = (
313-
246812FE1F8D013500462E53 /* PinLayoutTodayExtension */,
314279
160FB83905049FCEDD18DC8A /* Frameworks */,
315280
249EFE411E64FAFE00165E39 /* PinLayoutSample */,
316281
F143180314A617EFD07C5709 /* Pods */,
@@ -323,7 +288,6 @@
323288
isa = PBXGroup;
324289
children = (
325290
249EFE3F1E64FAFE00165E39 /* PinLayoutSample.app */,
326-
246812FB1F8D013500462E53 /* PinLayoutTodayExtension.appex */,
327291
);
328292
name = Products;
329293
sourceTree = "<group>";
@@ -414,23 +378,6 @@
414378
/* End PBXGroup section */
415379

416380
/* Begin PBXNativeTarget section */
417-
246812FA1F8D013500462E53 /* PinLayoutTodayExtension */ = {
418-
isa = PBXNativeTarget;
419-
buildConfigurationList = 2468130C1F8D013600462E53 /* Build configuration list for PBXNativeTarget "PinLayoutTodayExtension" */;
420-
buildPhases = (
421-
246812F71F8D013500462E53 /* Sources */,
422-
246812F81F8D013500462E53 /* Frameworks */,
423-
246812F91F8D013500462E53 /* Resources */,
424-
);
425-
buildRules = (
426-
);
427-
dependencies = (
428-
);
429-
name = PinLayoutTodayExtension;
430-
productName = PinLayoutTodayExtension;
431-
productReference = 246812FB1F8D013500462E53 /* PinLayoutTodayExtension.appex */;
432-
productType = "com.apple.product-type.app-extension";
433-
};
434381
249EFE3E1E64FAFE00165E39 /* PinLayoutSample */ = {
435382
isa = PBXNativeTarget;
436383
buildConfigurationList = 249EFE671E64FAFE00165E39 /* Build configuration list for PBXNativeTarget "PinLayoutSample" */;
@@ -449,7 +396,6 @@
449396
);
450397
dependencies = (
451398
2439CC2A1E6658C3003326FB /* PBXTargetDependency */,
452-
246813061F8D013500462E53 /* PBXTargetDependency */,
453399
);
454400
name = PinLayoutSample;
455401
productName = PinLayoutSample;
@@ -466,10 +412,6 @@
466412
LastUpgradeCheck = 0820;
467413
ORGANIZATIONNAME = Mirego;
468414
TargetAttributes = {
469-
246812FA1F8D013500462E53 = {
470-
CreatedOnToolsVersion = 9.0;
471-
ProvisioningStyle = Automatic;
472-
};
473415
249EFE3E1E64FAFE00165E39 = {
474416
CreatedOnToolsVersion = 8.2.1;
475417
ProvisioningStyle = Automatic;
@@ -496,7 +438,6 @@
496438
projectRoot = "";
497439
targets = (
498440
249EFE3E1E64FAFE00165E39 /* PinLayoutSample */,
499-
246812FA1F8D013500462E53 /* PinLayoutTodayExtension */,
500441
);
501442
};
502443
/* End PBXProject section */
@@ -526,14 +467,6 @@
526467
/* End PBXReferenceProxy section */
527468

528469
/* Begin PBXResourcesBuildPhase section */
529-
246812F91F8D013500462E53 /* Resources */ = {
530-
isa = PBXResourcesBuildPhase;
531-
buildActionMask = 2147483647;
532-
files = (
533-
246813031F8D013500462E53 /* MainInterface.storyboard in Resources */,
534-
);
535-
runOnlyForDeploymentPostprocessing = 0;
536-
};
537470
249EFE3D1E64FAFE00165E39 /* Resources */ = {
538471
isa = PBXResourcesBuildPhase;
539472
buildActionMask = 2147483647;
@@ -614,14 +547,6 @@
614547
/* End PBXShellScriptBuildPhase section */
615548

616549
/* Begin PBXSourcesBuildPhase section */
617-
246812F71F8D013500462E53 /* Sources */ = {
618-
isa = PBXSourcesBuildPhase;
619-
buildActionMask = 2147483647;
620-
files = (
621-
246813001F8D013500462E53 /* TodayViewController.swift in Sources */,
622-
);
623-
runOnlyForDeploymentPostprocessing = 0;
624-
};
625550
249EFE3B1E64FAFE00165E39 /* Sources */ = {
626551
isa = PBXSourcesBuildPhase;
627552
buildActionMask = 2147483647;
@@ -667,22 +592,9 @@
667592
name = PinLayout;
668593
targetProxy = 2439CC291E6658C3003326FB /* PBXContainerItemProxy */;
669594
};
670-
246813061F8D013500462E53 /* PBXTargetDependency */ = {
671-
isa = PBXTargetDependency;
672-
target = 246812FA1F8D013500462E53 /* PinLayoutTodayExtension */;
673-
targetProxy = 246813051F8D013500462E53 /* PBXContainerItemProxy */;
674-
};
675595
/* End PBXTargetDependency section */
676596

677597
/* Begin PBXVariantGroup section */
678-
246813011F8D013500462E53 /* MainInterface.storyboard */ = {
679-
isa = PBXVariantGroup;
680-
children = (
681-
246813021F8D013500462E53 /* Base */,
682-
);
683-
name = MainInterface.storyboard;
684-
sourceTree = "<group>";
685-
};
686598
249EFE4B1E64FAFE00165E39 /* LaunchScreen.storyboard */ = {
687599
isa = PBXVariantGroup;
688600
children = (
@@ -695,60 +607,6 @@
695607
/* End PBXVariantGroup section */
696608

697609
/* Begin XCBuildConfiguration section */
698-
246813081F8D013600462E53 /* Debug */ = {
699-
isa = XCBuildConfiguration;
700-
buildSettings = {
701-
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
702-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
703-
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
704-
CLANG_WARN_COMMA = YES;
705-
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
706-
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
707-
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
708-
CLANG_WARN_STRICT_PROTOTYPES = YES;
709-
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
710-
CODE_SIGN_IDENTITY = "iPhone Developer";
711-
CODE_SIGN_STYLE = Automatic;
712-
DEVELOPMENT_TEAM = "";
713-
GCC_C_LANGUAGE_STANDARD = gnu11;
714-
INFOPLIST_FILE = PinLayoutTodayExtension/Info.plist;
715-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
716-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
717-
PRODUCT_BUNDLE_IDENTIFIER = com.mirego.PinLayoutSample.PinLayoutTodayExtension;
718-
PRODUCT_NAME = "$(TARGET_NAME)";
719-
SKIP_INSTALL = YES;
720-
SWIFT_VERSION = 4.0;
721-
TARGETED_DEVICE_FAMILY = "1,2";
722-
};
723-
name = Debug;
724-
};
725-
246813091F8D013600462E53 /* Release */ = {
726-
isa = XCBuildConfiguration;
727-
buildSettings = {
728-
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
729-
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
730-
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
731-
CLANG_WARN_COMMA = YES;
732-
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
733-
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
734-
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
735-
CLANG_WARN_STRICT_PROTOTYPES = YES;
736-
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
737-
CODE_SIGN_IDENTITY = "iPhone Developer";
738-
CODE_SIGN_STYLE = Automatic;
739-
DEVELOPMENT_TEAM = "";
740-
GCC_C_LANGUAGE_STANDARD = gnu11;
741-
INFOPLIST_FILE = PinLayoutTodayExtension/Info.plist;
742-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
743-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
744-
PRODUCT_BUNDLE_IDENTIFIER = com.mirego.PinLayoutSample.PinLayoutTodayExtension;
745-
PRODUCT_NAME = "$(TARGET_NAME)";
746-
SKIP_INSTALL = YES;
747-
SWIFT_VERSION = 4.0;
748-
TARGETED_DEVICE_FAMILY = "1,2";
749-
};
750-
name = Release;
751-
};
752610
249EFE651E64FAFE00165E39 /* Debug */ = {
753611
isa = XCBuildConfiguration;
754612
buildSettings = {
@@ -880,15 +738,6 @@
880738
/* End XCBuildConfiguration section */
881739

882740
/* Begin XCConfigurationList section */
883-
2468130C1F8D013600462E53 /* Build configuration list for PBXNativeTarget "PinLayoutTodayExtension" */ = {
884-
isa = XCConfigurationList;
885-
buildConfigurations = (
886-
246813081F8D013600462E53 /* Debug */,
887-
246813091F8D013600462E53 /* Release */,
888-
);
889-
defaultConfigurationIsVisible = 0;
890-
defaultConfigurationName = Release;
891-
};
892741
249EFE3A1E64FAFE00165E39 /* Build configuration list for PBXProject "PinLayoutSample" */ = {
893742
isa = XCConfigurationList;
894743
buildConfigurations = (

‎Example/PinLayoutTodayExtension/Base.lproj/MainInterface.storyboard‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎Example/PinLayoutTodayExtension/Info.plist‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)