Skip to content

Commit 36bfcad

Browse files
saroarsaroar
committed
update ci
1 parent ef7ed40 commit 36bfcad

File tree

226 files changed

+684
-281
lines changed

Some content is hidden

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

226 files changed

+684
-281
lines changed

‎.github/workflows/swift.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ name: Swift
22

33
on:
44
pull_request:
5-
branches: [ main ]
6-
7-
pull_request:
8-
branches: [ develop ]
5+
branches: [ main, develop ]
96

107
jobs:
118

@@ -20,7 +17,9 @@ jobs:
2017

2118
build:
2219
needs: swiftLint
23-
runs-on: macos-latest
20+
env:
21+
DEVELOPER_DIR: /Applications/Xcode_13.0.app/Contents/Developer
22+
runs-on: macos-11.0
2423
steps:
2524
- uses: actions/checkout@v2
2625
- name: Install Bundle
@@ -35,13 +34,15 @@ jobs:
3534

3635
unitTests:
3736
needs: build
38-
runs-on: macos-latest
37+
env:
38+
DEVELOPER_DIR: /Applications/Xcode_13.0.app/Contents/Developer
39+
runs-on: macos-11.0
3940
steps:
4041
- uses: actions/checkout@v2
41-
- name: Download core tests
42+
- name: Run tests
4243
uses: actions/download-artifact@v2
4344
with:
44-
name: coreTests
45+
name: unitTests
4546
path: derivedData/Build/Products/Debug-iphonesimulator/EventFormViewTests.xctest
4647
- name: Install Bundle
4748
run: bundle install

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,3 +119,6 @@ Addame/Configs/Production.xcconfig
119119
/fastlane/FastlaneRunner
120120
test_output/report.html
121121
test_output/report.junit
122+
env-vars.sh
123+
Addame/Autogenerated/AppSecrets.generated.swift
124+
Addame/Templates/AppSecrets.stencil

‎Addame.xcodeproj/project.pbxproj

Lines changed: 130 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
C3186C642647F1FB00E1B69F /* AppFeature in Frameworks */ = {isa = PBXBuildFile; productRef = C3186C632647F1FB00E1B69F /* AppFeature */; };
1110
C33DFAC8261F1B4100132010 /* Environment.swift in Sources */ = {isa = PBXBuildFile; fileRef = C33DFAC7261F1B4100132010 /* Environment.swift */; };
11+
C3511D5D26EF6044004B9155 /* AppFeature in Frameworks */ = {isa = PBXBuildFile; productRef = C3511D5C26EF6044004B9155 /* AppFeature */; };
1212
C3E50CA0261B5DFA00285977 /* Addame.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3E50C9F261B5DFA00285977 /* Addame.swift */; };
1313
C3E50CA4261B5DFF00285977 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C3E50CA3261B5DFF00285977 /* Assets.xcassets */; };
1414
C3E50CA7261B5DFF00285977 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C3E50CA6261B5DFF00285977 /* Preview Assets.xcassets */; };
1515
/* End PBXBuildFile section */
1616

1717
/* Begin PBXFileReference section */
18-
C33DFABA261F1A9700132010 /* ProductionCopy.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ProductionCopy.xcconfig; sourceTree = "<group>"; };
18+
C33DFABA261F1A9700132010 /* ProductionCI.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ProductionCI.xcconfig; sourceTree = "<group>"; };
1919
C33DFABB261F1A9700132010 /* Production.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Production.xcconfig; sourceTree = "<group>"; };
20-
C33DFABC261F1A9700132010 /* DevelopmentCopy.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DevelopmentCopy.xcconfig; sourceTree = "<group>"; };
20+
C33DFABC261F1A9700132010 /* DevelopmentCI.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DevelopmentCI.xcconfig; sourceTree = "<group>"; };
2121
C33DFABD261F1A9700132010 /* Development.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Development.xcconfig; sourceTree = "<group>"; };
2222
C33DFAC7261F1B4100132010 /* Environment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Environment.swift; sourceTree = "<group>"; };
2323
C3E50C9C261B5DFA00285977 /* Addame.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Addame.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -32,7 +32,7 @@
3232
isa = PBXFrameworksBuildPhase;
3333
buildActionMask = 2147483647;
3434
files = (
35-
C3186C642647F1FB00E1B69F /* AppFeature in Frameworks */,
35+
C3511D5D26EF6044004B9155 /* AppFeature in Frameworks */,
3636
);
3737
runOnlyForDeploymentPostprocessing = 0;
3838
};
@@ -44,9 +44,9 @@
4444
children = (
4545
C33DFAC7261F1B4100132010 /* Environment.swift */,
4646
C33DFABD261F1A9700132010 /* Development.xcconfig */,
47-
C33DFABC261F1A9700132010 /* DevelopmentCopy.xcconfig */,
47+
C33DFABC261F1A9700132010 /* DevelopmentCI.xcconfig */,
4848
C33DFABB261F1A9700132010 /* Production.xcconfig */,
49-
C33DFABA261F1A9700132010 /* ProductionCopy.xcconfig */,
49+
C33DFABA261F1A9700132010 /* ProductionCI.xcconfig */,
5050
);
5151
path = Configs;
5252
sourceTree = "<group>";
@@ -107,14 +107,15 @@
107107
C3E50C9A261B5DFA00285977 /* Resources */,
108108
C36C678E26E3FC9A007CC94D /* swift-format */,
109109
C36AE8D826E8ABD6002FFF84 /* SwiftLint */,
110+
C39CB4FF26EF597C004BC15F /* ShellScript */,
110111
);
111112
buildRules = (
112113
);
113114
dependencies = (
114115
);
115116
name = Addame;
116117
packageProductDependencies = (
117-
C3186C632647F1FB00E1B69F /* AppFeature */,
118+
C3511D5C26EF6044004B9155 /* AppFeature */,
118119
);
119120
productName = TComposableAAddaMe;
120121
productReference = C3E50C9C261B5DFA00285977 /* Addame.app */;
@@ -201,6 +202,23 @@
201202
shellPath = /bin/sh;
202203
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n#if which swift-format >/dev/null; then\n # swift-format -m format -i -r ${PROJECT_DIR}\n # swift-format -m lint -r ${PROJECT_DIR}\n#else\n # echo \"warning: swift-format not installed\"\n#fi\n";
203204
};
205+
C39CB4FF26EF597C004BC15F /* ShellScript */ = {
206+
isa = PBXShellScriptBuildPhase;
207+
buildActionMask = 2147483647;
208+
files = (
209+
);
210+
inputFileListPaths = (
211+
);
212+
inputPaths = (
213+
);
214+
outputFileListPaths = (
215+
);
216+
outputPaths = (
217+
);
218+
runOnlyForDeploymentPostprocessing = 0;
219+
shellPath = /bin/sh;
220+
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n";
221+
};
204222
/* End PBXShellScriptBuildPhase section */
205223

206224
/* Begin PBXSourcesBuildPhase section */
@@ -216,9 +234,100 @@
216234
/* End PBXSourcesBuildPhase section */
217235

218236
/* Begin XCBuildConfiguration section */
219-
C3E50CA9261B5DFF00285977 /* Debug */ = {
237+
C3C1EE1C26EDFC7E00376AE6 /* Debug Development */ = {
238+
isa = XCBuildConfiguration;
239+
baseConfigurationReference = C33DFABD261F1A9700132010 /* Development.xcconfig */;
240+
buildSettings = {
241+
ALWAYS_SEARCH_USER_PATHS = NO;
242+
CLANG_ANALYZER_NONNULL = YES;
243+
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
244+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
245+
CLANG_CXX_LIBRARY = "libc++";
246+
CLANG_ENABLE_MODULES = YES;
247+
CLANG_ENABLE_OBJC_ARC = YES;
248+
CLANG_ENABLE_OBJC_WEAK = YES;
249+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
250+
CLANG_WARN_BOOL_CONVERSION = YES;
251+
CLANG_WARN_COMMA = YES;
252+
CLANG_WARN_CONSTANT_CONVERSION = YES;
253+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
254+
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
255+
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
256+
CLANG_WARN_EMPTY_BODY = YES;
257+
CLANG_WARN_ENUM_CONVERSION = YES;
258+
CLANG_WARN_INFINITE_RECURSION = YES;
259+
CLANG_WARN_INT_CONVERSION = YES;
260+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
261+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
262+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
263+
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
264+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
265+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
266+
CLANG_WARN_STRICT_PROTOTYPES = YES;
267+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
268+
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
269+
CLANG_WARN_UNREACHABLE_CODE = YES;
270+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
271+
COPY_PHASE_STRIP = NO;
272+
DEBUG_INFORMATION_FORMAT = dwarf;
273+
ENABLE_STRICT_OBJC_MSGSEND = YES;
274+
ENABLE_TESTABILITY = YES;
275+
GCC_C_LANGUAGE_STANDARD = gnu11;
276+
GCC_DYNAMIC_NO_PIC = NO;
277+
GCC_NO_COMMON_BLOCKS = YES;
278+
GCC_OPTIMIZATION_LEVEL = 0;
279+
GCC_PREPROCESSOR_DEFINITIONS = (
280+
"DEBUG=1",
281+
"$(inherited)",
282+
);
283+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
284+
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
285+
GCC_WARN_UNDECLARED_SELECTOR = YES;
286+
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
287+
GCC_WARN_UNUSED_FUNCTION = YES;
288+
GCC_WARN_UNUSED_VARIABLE = YES;
289+
IPHONEOS_DEPLOYMENT_TARGET = 14.1;
290+
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
291+
MTL_FAST_MATH = YES;
292+
ONLY_ACTIVE_ARCH = YES;
293+
SDKROOT = iphoneos;
294+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
295+
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
296+
SWIFT_VERSION = 5.0;
297+
};
298+
name = "Debug Development";
299+
};
300+
C3C1EE1D26EDFC7E00376AE6 /* Debug Development */ = {
220301
isa = XCBuildConfiguration;
221302
baseConfigurationReference = C33DFABD261F1A9700132010 /* Development.xcconfig */;
303+
buildSettings = {
304+
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
305+
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
306+
CODE_SIGN_IDENTITY = "Apple Development";
307+
CODE_SIGN_STYLE = Automatic;
308+
CURRENT_PROJECT_VERSION = 2;
309+
DEVELOPMENT_ASSET_PATHS = "\"Addame/Preview Content\"";
310+
DEVELOPMENT_TEAM = 6989658CU5;
311+
ENABLE_PREVIEWS = YES;
312+
INFOPLIST_FILE = AddaMe/Info.plist;
313+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
314+
LD_RUNPATH_SEARCH_PATHS = (
315+
"$(inherited)",
316+
"@executable_path/Frameworks",
317+
);
318+
MARKETING_VERSION = 1.0.0;
319+
PRODUCT_BUNDLE_IDENTIFIER = com.addame.AddaMeIOS;
320+
PRODUCT_NAME = "$(TARGET_NAME)";
321+
PROVISIONING_PROFILE_SPECIFIER = "";
322+
SWIFT_VERSION = 5.0;
323+
TARGETED_DEVICE_FAMILY = "1,2";
324+
VERSIONING_SYSTEM = "apple-generic";
325+
};
326+
name = "Debug Development";
327+
};
328+
C3E50CA9261B5DFF00285977 /* Debug CI */ = {
329+
isa = XCBuildConfiguration;
330+
baseConfigurationReference = C33DFABC261F1A9700132010 /* DevelopmentCI.xcconfig */;
222331
buildSettings = {
223332
ALWAYS_SEARCH_USER_PATHS = NO;
224333
CLANG_ANALYZER_NONNULL = YES;
@@ -277,7 +386,7 @@
277386
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
278387
SWIFT_VERSION = 5.0;
279388
};
280-
name = Debug;
389+
name = "Debug CI";
281390
};
282391
C3E50CAA261B5DFF00285977 /* Release */ = {
283392
isa = XCBuildConfiguration;
@@ -336,12 +445,13 @@
336445
};
337446
name = Release;
338447
};
339-
C3E50CAC261B5DFF00285977 /* Debug */ = {
448+
C3E50CAC261B5DFF00285977 /* Debug CI */ = {
340449
isa = XCBuildConfiguration;
341-
baseConfigurationReference = C33DFABD261F1A9700132010 /* Development.xcconfig */;
450+
baseConfigurationReference = C33DFABC261F1A9700132010 /* DevelopmentCI.xcconfig */;
342451
buildSettings = {
343452
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
344453
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
454+
CODE_SIGN_IDENTITY = "Apple Development";
345455
CODE_SIGN_STYLE = Automatic;
346456
CURRENT_PROJECT_VERSION = 2;
347457
DEVELOPMENT_ASSET_PATHS = "\"Addame/Preview Content\"";
@@ -356,18 +466,20 @@
356466
MARKETING_VERSION = 1.0.0;
357467
PRODUCT_BUNDLE_IDENTIFIER = com.addame.AddaMeIOS;
358468
PRODUCT_NAME = "$(TARGET_NAME)";
469+
PROVISIONING_PROFILE_SPECIFIER = "";
359470
SWIFT_VERSION = 5.0;
360471
TARGETED_DEVICE_FAMILY = "1,2";
361472
VERSIONING_SYSTEM = "apple-generic";
362473
};
363-
name = Debug;
474+
name = "Debug CI";
364475
};
365476
C3E50CAD261B5DFF00285977 /* Release */ = {
366477
isa = XCBuildConfiguration;
367478
baseConfigurationReference = C33DFABB261F1A9700132010 /* Production.xcconfig */;
368479
buildSettings = {
369480
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
370481
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
482+
CODE_SIGN_IDENTITY = "Apple Development";
371483
CODE_SIGN_STYLE = Automatic;
372484
CURRENT_PROJECT_VERSION = 2;
373485
DEVELOPMENT_ASSET_PATHS = "\"Addame/Preview Content\"";
@@ -382,6 +494,7 @@
382494
MARKETING_VERSION = 1.0.0;
383495
PRODUCT_BUNDLE_IDENTIFIER = com.addame.AddaMeIOS;
384496
PRODUCT_NAME = "$(TARGET_NAME)";
497+
PROVISIONING_PROFILE_SPECIFIER = "";
385498
SWIFT_VERSION = 5.0;
386499
TARGETED_DEVICE_FAMILY = "1,2";
387500
VERSIONING_SYSTEM = "apple-generic";
@@ -394,7 +507,8 @@
394507
C3E50C97261B5DFA00285977 /* Build configuration list for PBXProject "Addame" */ = {
395508
isa = XCConfigurationList;
396509
buildConfigurations = (
397-
C3E50CA9261B5DFF00285977 /* Debug */,
510+
C3E50CA9261B5DFF00285977 /* Debug CI */,
511+
C3C1EE1C26EDFC7E00376AE6 /* Debug Development */,
398512
C3E50CAA261B5DFF00285977 /* Release */,
399513
);
400514
defaultConfigurationIsVisible = 0;
@@ -403,7 +517,8 @@
403517
C3E50CAB261B5DFF00285977 /* Build configuration list for PBXNativeTarget "Addame" */ = {
404518
isa = XCConfigurationList;
405519
buildConfigurations = (
406-
C3E50CAC261B5DFF00285977 /* Debug */,
520+
C3E50CAC261B5DFF00285977 /* Debug CI */,
521+
C3C1EE1D26EDFC7E00376AE6 /* Debug Development */,
407522
C3E50CAD261B5DFF00285977 /* Release */,
408523
);
409524
defaultConfigurationIsVisible = 0;
@@ -412,7 +527,7 @@
412527
/* End XCConfigurationList section */
413528

414529
/* Begin XCSwiftPackageProductDependency section */
415-
C3186C632647F1FB00E1B69F /* AppFeature */ = {
530+
C3511D5C26EF6044004B9155 /* AppFeature */ = {
416531
isa = XCSwiftPackageProductDependency;
417532
productName = AppFeature;
418533
};

‎Addame.xcworkspace/contents.xcworkspacedata

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Addame.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@
105105
"repositoryURL": "https://github.com/pointfreeco/swift-composable-architecture.git",
106106
"state": {
107107
"branch": null,
108-
"revision": "60dc8067185b3e1fb29237f5a4548bff005b0fec",
109-
"version": "0.26.0"
108+
"revision": "e2795c1789c8f44fe62301892d585e44772ff880",
109+
"version": "0.27.0"
110110
}
111111
},
112112
{
@@ -132,17 +132,17 @@
132132
"repositoryURL": "https://github.com/apple/swift-nio.git",
133133
"state": {
134134
"branch": null,
135-
"revision": "94f41c4121a82fae5c7b1cb03e630e9f9e5e20f1",
136-
"version": "2.32.1"
135+
"revision": "f2705f9655ede35399b12040e892cf653126de98",
136+
"version": "2.32.2"
137137
}
138138
},
139139
{
140140
"package": "swift-nio-ssl",
141141
"repositoryURL": "https://github.com/apple/swift-nio-ssl.git",
142142
"state": {
143143
"branch": null,
144-
"revision": "4829979d9f5ed9a2f4c6efd9c1ed51d1ab4d0394",
145-
"version": "2.14.1"
144+
"revision": "2e74773972bd6254c41ceeda827f229bccbf1c0f",
145+
"version": "2.15.0"
146146
}
147147
},
148148
{

‎Addame.xcworkspace/xcshareddata/xcschemes/Addame.xcscheme renamed to ‎Addame.xcworkspace/xcshareddata/xcschemes/AddameCI.xcscheme

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@
723723
</BuildActionEntries>
724724
</BuildAction>
725725
<TestAction
726-
buildConfiguration = "Debug"
726+
buildConfiguration = "Debug CI"
727727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
728728
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
729729
shouldUseLaunchSchemeArgsEnv = "YES">
@@ -741,7 +741,7 @@
741741
</Testables>
742742
</TestAction>
743743
<LaunchAction
744-
buildConfiguration = "Debug"
744+
buildConfiguration = "Debug CI"
745745
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
746746
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
747747
launchStyle = "0"
@@ -762,7 +762,7 @@
762762
</BuildableProductRunnable>
763763
</LaunchAction>
764764
<ProfileAction
765-
buildConfiguration = "Release"
765+
buildConfiguration = "Debug CI"
766766
shouldUseLaunchSchemeArgsEnv = "YES"
767767
savedToolIdentifier = ""
768768
useCustomWorkingDirectory = "NO"
@@ -779,10 +779,10 @@
779779
</BuildableProductRunnable>
780780
</ProfileAction>
781781
<AnalyzeAction
782-
buildConfiguration = "Debug">
782+
buildConfiguration = "Debug CI">
783783
</AnalyzeAction>
784784
<ArchiveAction
785-
buildConfiguration = "Release"
785+
buildConfiguration = "Debug CI"
786786
revealArchiveInOrganizer = "YES">
787787
</ArchiveAction>
788788
</Scheme>

0 commit comments

Comments
 (0)