Skip to content

Commit 2ffaa83

Browse files
mikhailChelbaevmikhailChelbaev
authored
Merge pull request #8 from componentskit/dev
v1.0.0
2 parents 483778a + 27aa5c9 commit 2ffaa83

39 files changed

+149
-170
lines changed

‎App/SwiftComponentsApp/SwiftComponentsApp.xcodeproj/project.pbxproj ‎App/ComponentsKitApp/ComponentsKitApp.xcodeproj/project.pbxproj

+72-83
Original file line numberDiff line numberDiff line change
@@ -7,114 +7,114 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
74F320A02CAD697000BF65A1 /* SwiftComponents in Frameworks */ = {isa = PBXBuildFile; productRef = 74F3209F2CAD697000BF65A1 /* SwiftComponents */; };
10+
74418E962CCBA05200FD73A4 /* ComponentsKit in Frameworks */ = {isa = PBXBuildFile; productRef = 74418E952CCBA05200FD73A4 /* ComponentsKit */; };
1111
/* End PBXBuildFile section */
1212

1313
/* Begin PBXFileReference section */
14-
74F320552CAD68A500BF65A1 /* SwiftComponentsApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SwiftComponentsApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
14+
74418E612CCB9FDD00FD73A4 /* ComponentsKitApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ComponentsKitApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
1515
/* End PBXFileReference section */
1616

1717
/* Begin PBXFileSystemSynchronizedRootGroup section */
18-
74F320572CAD68A500BF65A1 /* SwiftComponentsApp */ = {
18+
74418E632CCB9FDD00FD73A4 /* ComponentsKitApp */ = {
1919
isa = PBXFileSystemSynchronizedRootGroup;
20-
path = SwiftComponentsApp;
20+
path = ComponentsKitApp;
2121
sourceTree = "<group>";
2222
};
2323
/* End PBXFileSystemSynchronizedRootGroup section */
2424

2525
/* Begin PBXFrameworksBuildPhase section */
26-
74F320522CAD68A500BF65A1 /* Frameworks */ = {
26+
74418E5E2CCB9FDD00FD73A4 /* Frameworks */ = {
2727
isa = PBXFrameworksBuildPhase;
2828
buildActionMask = 2147483647;
2929
files = (
30-
74F320A02CAD697000BF65A1 /* SwiftComponents in Frameworks */,
30+
74418E962CCBA05200FD73A4 /* ComponentsKit in Frameworks */,
3131
);
3232
runOnlyForDeploymentPostprocessing = 0;
3333
};
3434
/* End PBXFrameworksBuildPhase section */
3535

3636
/* Begin PBXGroup section */
37-
74F3204C2CAD68A500BF65A1 = {
37+
74418E582CCB9FDD00FD73A4 = {
3838
isa = PBXGroup;
3939
children = (
40-
74F320572CAD68A500BF65A1 /* SwiftComponentsApp */,
41-
74F320562CAD68A500BF65A1 /* Products */,
40+
74418E632CCB9FDD00FD73A4 /* ComponentsKitApp */,
41+
74418E622CCB9FDD00FD73A4 /* Products */,
4242
);
4343
sourceTree = "<group>";
4444
};
45-
74F320562CAD68A500BF65A1 /* Products */ = {
45+
74418E622CCB9FDD00FD73A4 /* Products */ = {
4646
isa = PBXGroup;
4747
children = (
48-
74F320552CAD68A500BF65A1 /* SwiftComponentsApp.app */,
48+
74418E612CCB9FDD00FD73A4 /* ComponentsKitApp.app */,
4949
);
5050
name = Products;
5151
sourceTree = "<group>";
5252
};
5353
/* End PBXGroup section */
5454

5555
/* Begin PBXNativeTarget section */
56-
74F320542CAD68A500BF65A1 /* SwiftComponentsApp */ = {
56+
74418E602CCB9FDD00FD73A4 /* ComponentsKitApp */ = {
5757
isa = PBXNativeTarget;
58-
buildConfigurationList = 74F320642CAD68A600BF65A1 /* Build configuration list for PBXNativeTarget "SwiftComponentsApp" */;
58+
buildConfigurationList = 74418E6F2CCB9FDF00FD73A4 /* Build configuration list for PBXNativeTarget "ComponentsKitApp" */;
5959
buildPhases = (
60-
74F320512CAD68A500BF65A1 /* Sources */,
61-
74F320522CAD68A500BF65A1 /* Frameworks */,
62-
74F320532CAD68A500BF65A1 /* Resources */,
60+
74418E5D2CCB9FDD00FD73A4 /* Sources */,
61+
74418E5E2CCB9FDD00FD73A4 /* Frameworks */,
62+
74418E5F2CCB9FDD00FD73A4 /* Resources */,
6363
);
6464
buildRules = (
6565
);
6666
dependencies = (
6767
);
6868
fileSystemSynchronizedGroups = (
69-
74F320572CAD68A500BF65A1 /* SwiftComponentsApp */,
69+
74418E632CCB9FDD00FD73A4 /* ComponentsKitApp */,
7070
);
71-
name = SwiftComponentsApp;
71+
name = ComponentsKitApp;
7272
packageProductDependencies = (
73-
74F3209F2CAD697000BF65A1 /* SwiftComponents */,
73+
74418E952CCBA05200FD73A4 /* ComponentsKit */,
7474
);
75-
productName = SwiftComponentsApp;
76-
productReference = 74F320552CAD68A500BF65A1 /* SwiftComponentsApp.app */;
75+
productName = ComponentsKitApp;
76+
productReference = 74418E612CCB9FDD00FD73A4 /* ComponentsKitApp.app */;
7777
productType = "com.apple.product-type.application";
7878
};
7979
/* End PBXNativeTarget section */
8080

8181
/* Begin PBXProject section */
82-
74F3204D2CAD68A500BF65A1 /* Project object */ = {
82+
74418E592CCB9FDD00FD73A4 /* Project object */ = {
8383
isa = PBXProject;
8484
attributes = {
8585
BuildIndependentTargetsInParallel = 1;
8686
LastSwiftUpdateCheck = 1600;
8787
LastUpgradeCheck = 1600;
8888
TargetAttributes = {
89-
74F320542CAD68A500BF65A1 = {
89+
74418E602CCB9FDD00FD73A4 = {
9090
CreatedOnToolsVersion = 16.0;
9191
};
9292
};
9393
};
94-
buildConfigurationList = 74F320502CAD68A500BF65A1 /* Build configuration list for PBXProject "SwiftComponentsApp" */;
94+
buildConfigurationList = 74418E5C2CCB9FDD00FD73A4 /* Build configuration list for PBXProject "ComponentsKitApp" */;
9595
developmentRegion = en;
9696
hasScannedForEncodings = 0;
9797
knownRegions = (
9898
en,
9999
Base,
100100
);
101-
mainGroup = 74F3204C2CAD68A500BF65A1;
101+
mainGroup = 74418E582CCB9FDD00FD73A4;
102102
minimizedProjectReferenceProxies = 1;
103103
packageReferences = (
104-
74F3209E2CAD697000BF65A1 /* XCLocalSwiftPackageReference "../../../SwiftComponents" */,
104+
74418E942CCBA05200FD73A4 /* XCLocalSwiftPackageReference "../../../ComponentsKit" */,
105105
);
106106
preferredProjectObjectVersion = 77;
107-
productRefGroup = 74F320562CAD68A500BF65A1 /* Products */;
107+
productRefGroup = 74418E622CCB9FDD00FD73A4 /* Products */;
108108
projectDirPath = "";
109109
projectRoot = "";
110110
targets = (
111-
74F320542CAD68A500BF65A1 /* SwiftComponentsApp */,
111+
74418E602CCB9FDD00FD73A4 /* ComponentsKitApp */,
112112
);
113113
};
114114
/* End PBXProject section */
115115

116116
/* Begin PBXResourcesBuildPhase section */
117-
74F320532CAD68A500BF65A1 /* Resources */ = {
117+
74418E5F2CCB9FDD00FD73A4 /* Resources */ = {
118118
isa = PBXResourcesBuildPhase;
119119
buildActionMask = 2147483647;
120120
files = (
@@ -124,7 +124,7 @@
124124
/* End PBXResourcesBuildPhase section */
125125

126126
/* Begin PBXSourcesBuildPhase section */
127-
74F320512CAD68A500BF65A1 /* Sources */ = {
127+
74418E5D2CCB9FDD00FD73A4 /* Sources */ = {
128128
isa = PBXSourcesBuildPhase;
129129
buildActionMask = 2147483647;
130130
files = (
@@ -134,7 +134,7 @@
134134
/* End PBXSourcesBuildPhase section */
135135

136136
/* Begin XCBuildConfiguration section */
137-
74F320622CAD68A600BF65A1 /* Debug */ = {
137+
74418E6D2CCB9FDF00FD73A4 /* Debug */ = {
138138
isa = XCBuildConfiguration;
139139
buildSettings = {
140140
ALWAYS_SEARCH_USER_PATHS = NO;
@@ -186,16 +186,18 @@
186186
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
187187
GCC_WARN_UNUSED_FUNCTION = YES;
188188
GCC_WARN_UNUSED_VARIABLE = YES;
189+
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
189190
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
190191
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
191192
MTL_FAST_MATH = YES;
192193
ONLY_ACTIVE_ARCH = YES;
194+
SDKROOT = iphoneos;
193195
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
194196
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
195197
};
196198
name = Debug;
197199
};
198-
74F320632CAD68A600BF65A1 /* Release */ = {
200+
74418E6E2CCB9FDF00FD73A4 /* Release */ = {
199201
isa = XCBuildConfiguration;
200202
buildSettings = {
201203
ALWAYS_SEARCH_USER_PATHS = NO;
@@ -241,123 +243,110 @@
241243
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
242244
GCC_WARN_UNUSED_FUNCTION = YES;
243245
GCC_WARN_UNUSED_VARIABLE = YES;
246+
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
244247
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
245248
MTL_ENABLE_DEBUG_INFO = NO;
246249
MTL_FAST_MATH = YES;
250+
SDKROOT = iphoneos;
247251
SWIFT_COMPILATION_MODE = wholemodule;
252+
VALIDATE_PRODUCT = YES;
248253
};
249254
name = Release;
250255
};
251-
74F320652CAD68A600BF65A1 /* Debug */ = {
256+
74418E702CCB9FDF00FD73A4 /* Debug */ = {
252257
isa = XCBuildConfiguration;
253258
buildSettings = {
254259
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
255260
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
256-
CODE_SIGN_ENTITLEMENTS = SwiftComponentsApp/SwiftComponentsApp.entitlements;
257261
CODE_SIGN_STYLE = Automatic;
258262
CURRENT_PROJECT_VERSION = 1;
263+
DEVELOPMENT_ASSET_PATHS = "";
259264
ENABLE_PREVIEWS = YES;
260265
GENERATE_INFOPLIST_FILE = YES;
261-
INFOPLIST_KEY_CFBundleDisplayName = Components;
262-
"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES;
263-
"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphonesimulator*]" = YES;
264-
"INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphoneos*]" = YES;
265-
"INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphonesimulator*]" = YES;
266-
"INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphoneos*]" = YES;
267-
"INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphonesimulator*]" = YES;
268-
"INFOPLIST_KEY_UIStatusBarStyle[sdk=iphoneos*]" = UIStatusBarStyleDefault;
269-
"INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault;
266+
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
267+
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
268+
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
270269
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
271270
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
272-
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
273-
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
274-
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
275-
MACOSX_DEPLOYMENT_TARGET = 15.0;
271+
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
272+
LD_RUNPATH_SEARCH_PATHS = (
273+
"$(inherited)",
274+
"@executable_path/Frameworks",
275+
);
276276
MARKETING_VERSION = 1.0;
277-
PRODUCT_BUNDLE_IDENTIFIER = io.swiftcomponents.SwiftComponentsApp;
277+
PRODUCT_BUNDLE_IDENTIFIER = io.componentskit.ComponentsKitApp;
278278
PRODUCT_NAME = "$(TARGET_NAME)";
279-
SDKROOT = auto;
280-
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator";
281279
SWIFT_EMIT_LOC_STRINGS = YES;
282280
SWIFT_VERSION = 5.0;
283-
TARGETED_DEVICE_FAMILY = "1,2,7";
284-
XROS_DEPLOYMENT_TARGET = 2.0;
281+
TARGETED_DEVICE_FAMILY = "1,2";
285282
};
286283
name = Debug;
287284
};
288-
74F320662CAD68A600BF65A1 /* Release */ = {
285+
74418E712CCB9FDF00FD73A4 /* Release */ = {
289286
isa = XCBuildConfiguration;
290287
buildSettings = {
291288
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
292289
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
293-
CODE_SIGN_ENTITLEMENTS = SwiftComponentsApp/SwiftComponentsApp.entitlements;
294290
CODE_SIGN_STYLE = Automatic;
295291
CURRENT_PROJECT_VERSION = 1;
292+
DEVELOPMENT_ASSET_PATHS = "";
296293
ENABLE_PREVIEWS = YES;
297294
GENERATE_INFOPLIST_FILE = YES;
298-
INFOPLIST_KEY_CFBundleDisplayName = Components;
299-
"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES;
300-
"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphonesimulator*]" = YES;
301-
"INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphoneos*]" = YES;
302-
"INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphonesimulator*]" = YES;
303-
"INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphoneos*]" = YES;
304-
"INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphonesimulator*]" = YES;
305-
"INFOPLIST_KEY_UIStatusBarStyle[sdk=iphoneos*]" = UIStatusBarStyleDefault;
306-
"INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault;
295+
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
296+
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
297+
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
307298
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
308299
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
309-
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
310-
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
311-
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
312-
MACOSX_DEPLOYMENT_TARGET = 15.0;
300+
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
301+
LD_RUNPATH_SEARCH_PATHS = (
302+
"$(inherited)",
303+
"@executable_path/Frameworks",
304+
);
313305
MARKETING_VERSION = 1.0;
314-
PRODUCT_BUNDLE_IDENTIFIER = io.swiftcomponents.SwiftComponentsApp;
306+
PRODUCT_BUNDLE_IDENTIFIER = io.componentskit.ComponentsKitApp;
315307
PRODUCT_NAME = "$(TARGET_NAME)";
316-
SDKROOT = auto;
317-
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator";
318308
SWIFT_EMIT_LOC_STRINGS = YES;
319309
SWIFT_VERSION = 5.0;
320-
TARGETED_DEVICE_FAMILY = "1,2,7";
321-
XROS_DEPLOYMENT_TARGET = 2.0;
310+
TARGETED_DEVICE_FAMILY = "1,2";
322311
};
323312
name = Release;
324313
};
325314
/* End XCBuildConfiguration section */
326315

327316
/* Begin XCConfigurationList section */
328-
74F320502CAD68A500BF65A1 /* Build configuration list for PBXProject "SwiftComponentsApp" */ = {
317+
74418E5C2CCB9FDD00FD73A4 /* Build configuration list for PBXProject "ComponentsKitApp" */ = {
329318
isa = XCConfigurationList;
330319
buildConfigurations = (
331-
74F320622CAD68A600BF65A1 /* Debug */,
332-
74F320632CAD68A600BF65A1 /* Release */,
320+
74418E6D2CCB9FDF00FD73A4 /* Debug */,
321+
74418E6E2CCB9FDF00FD73A4 /* Release */,
333322
);
334323
defaultConfigurationIsVisible = 0;
335324
defaultConfigurationName = Release;
336325
};
337-
74F320642CAD68A600BF65A1 /* Build configuration list for PBXNativeTarget "SwiftComponentsApp" */ = {
326+
74418E6F2CCB9FDF00FD73A4 /* Build configuration list for PBXNativeTarget "ComponentsKitApp" */ = {
338327
isa = XCConfigurationList;
339328
buildConfigurations = (
340-
74F320652CAD68A600BF65A1 /* Debug */,
341-
74F320662CAD68A600BF65A1 /* Release */,
329+
74418E702CCB9FDF00FD73A4 /* Debug */,
330+
74418E712CCB9FDF00FD73A4 /* Release */,
342331
);
343332
defaultConfigurationIsVisible = 0;
344333
defaultConfigurationName = Release;
345334
};
346335
/* End XCConfigurationList section */
347336

348337
/* Begin XCLocalSwiftPackageReference section */
349-
74F3209E2CAD697000BF65A1 /* XCLocalSwiftPackageReference "../../../SwiftComponents" */ = {
338+
74418E942CCBA05200FD73A4 /* XCLocalSwiftPackageReference "../../../ComponentsKit" */ = {
350339
isa = XCLocalSwiftPackageReference;
351-
relativePath = ../../../SwiftComponents;
340+
relativePath = ../../../ComponentsKit;
352341
};
353342
/* End XCLocalSwiftPackageReference section */
354343

355344
/* Begin XCSwiftPackageProductDependency section */
356-
74F3209F2CAD697000BF65A1 /* SwiftComponents */ = {
345+
74418E952CCBA05200FD73A4 /* ComponentsKit */ = {
357346
isa = XCSwiftPackageProductDependency;
358-
productName = SwiftComponents;
347+
productName = ComponentsKit;
359348
};
360349
/* End XCSwiftPackageProductDependency section */
361350
};
362-
rootObject = 74F3204D2CAD68A500BF65A1 /* Project object */;
351+
rootObject = 74418E592CCB9FDD00FD73A4 /* Project object */;
363352
}

‎App/SwiftComponentsApp/SwiftComponentsApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata ‎App/ComponentsKitApp/ComponentsKitApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata

File renamed without changes.

‎App/SwiftComponentsApp/SwiftComponentsApp/Assets.xcassets/AccentColor.colorset/Contents.json ‎App/ComponentsKitApp/ComponentsKitApp/Assets.xcassets/AccentColor.colorset/Contents.json

File renamed without changes.

‎App/SwiftComponentsApp/SwiftComponentsApp/Assets.xcassets/AppIcon.appiconset/Contents.json ‎App/ComponentsKitApp/ComponentsKitApp/Assets.xcassets/AppIcon.appiconset/Contents.json

File renamed without changes.

‎App/ComponentsKitApp/ComponentsKitApp/Assets.xcassets/AppIcon.appiconset/app_icon_dark.png

128 KB
Loading

‎App/ComponentsKitApp/ComponentsKitApp/Assets.xcassets/AppIcon.appiconset/app_icon_light.png

101 KB
Loading

‎App/ComponentsKitApp/ComponentsKitApp/Assets.xcassets/AppIcon.appiconset/app_icon_tinted.png

146 KB
Loading

‎App/SwiftComponentsApp/SwiftComponentsApp/Assets.xcassets/Contents.json ‎App/ComponentsKitApp/ComponentsKitApp/Assets.xcassets/Contents.json

File renamed without changes.

‎App/SwiftComponentsApp/SwiftComponentsApp/Core/App.swift ‎App/ComponentsKitApp/ComponentsKitApp/Core/App.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1+
import ComponentsKit
12
import SwiftUI
2-
import SwiftComponents
33

44
struct App: View {
55
var body: some View {
66
NavigationStack {
77
List {
88
Section {
9-
Text("Discover more information about **SwiftComponents** on the website.")
9+
Text("Discover more information about **ComponentsKit** on the website.")
1010
SUButton(
1111
model: .init {
1212
$0.title = "Open Website"
1313
$0.isFullWidth = true
1414
},
1515
action: {
16-
guard let url = URL(string: "https://swiftcomponents.io") else { return }
16+
guard let url = URL(string: "https://componentskit.io") else { return }
1717
UIApplication.shared.open(url)
1818
}
1919
)
@@ -48,7 +48,7 @@ struct App: View {
4848
}
4949
}
5050
}
51-
.navigationTitle("SwiftComponents")
51+
.navigationTitle("ComponentsKit")
5252
.navigationBarTitleDisplayMode(.inline)
5353
}
5454
}

0 commit comments

Comments
 (0)