From d0dae4a7eb7e30ef25d20c9e0a41c8d93c532808 Mon Sep 17 00:00:00 2001 From: Javier Cicchelli Date: Tue, 20 Dec 2022 02:57:16 +0100 Subject: [PATCH] Removed the BeReal unit test target and arranged the folder structure of the BeReal app target. --- BeReal.xcodeproj/project.pbxproj | 159 +++--------------- BeReal/{ => App}/BeRealApp.swift | 0 .../AccentColor.colorset/Contents.json | 0 .../AppIcon.appiconset/Contents.json | 0 .../AppIcon.appiconset/MyFiles.png | Bin .../Assets.xcassets/Contents.json | 0 .../Preview Assets.xcassets/Contents.json | 0 BeRealTests/BeRealTests.swift | 37 ---- 8 files changed, 21 insertions(+), 175 deletions(-) rename BeReal/{ => App}/BeRealApp.swift (100%) rename BeReal/{ => Assets}/Assets.xcassets/AccentColor.colorset/Contents.json (100%) rename BeReal/{ => Assets}/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename BeReal/{ => Assets}/Assets.xcassets/AppIcon.appiconset/MyFiles.png (100%) rename BeReal/{ => Assets}/Assets.xcassets/Contents.json (100%) rename BeReal/{Preview Content => Assets}/Preview Assets.xcassets/Contents.json (100%) delete mode 100644 BeRealTests/BeRealTests.swift diff --git a/BeReal.xcodeproj/project.pbxproj b/BeReal.xcodeproj/project.pbxproj index e08e578..0233f15 100644 --- a/BeReal.xcodeproj/project.pbxproj +++ b/BeReal.xcodeproj/project.pbxproj @@ -13,7 +13,6 @@ 02AE64F129363DBF005A4AF3 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02AE64F029363DBF005A4AF3 /* ContentView.swift */; }; 02AE64F329363DC1005A4AF3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 02AE64F229363DC1005A4AF3 /* Assets.xcassets */; }; 02AE64F629363DC1005A4AF3 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 02AE64F529363DC1005A4AF3 /* Preview Assets.xcassets */; }; - 02AE650029363DC1005A4AF3 /* BeRealTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02AE64FF29363DC1005A4AF3 /* BeRealTests.swift */; }; 02AE650A29363DC1005A4AF3 /* BeRealUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02AE650929363DC1005A4AF3 /* BeRealUITests.swift */; }; 02AE650C29363DC1005A4AF3 /* BeRealUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02AE650B29363DC1005A4AF3 /* BeRealUITestsLaunchTests.swift */; }; 4673A2AC294656A1000FE043 /* Cores in Frameworks */ = {isa = PBXBuildFile; productRef = 4673A2AB294656A1000FE043 /* Cores */; }; @@ -21,13 +20,6 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 02AE64FC29363DC1005A4AF3 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 02AE64E329363DBF005A4AF3 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 02AE64EA29363DBF005A4AF3; - remoteInfo = BeReal; - }; 02AE650629363DC1005A4AF3 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 02AE64E329363DBF005A4AF3 /* Project object */; @@ -46,8 +38,6 @@ 02AE64F029363DBF005A4AF3 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; 02AE64F229363DC1005A4AF3 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 02AE64F529363DC1005A4AF3 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; - 02AE64FB29363DC1005A4AF3 /* BeRealTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BeRealTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 02AE64FF29363DC1005A4AF3 /* BeRealTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BeRealTests.swift; sourceTree = ""; }; 02AE650529363DC1005A4AF3 /* BeRealUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BeRealUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 02AE650929363DC1005A4AF3 /* BeRealUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BeRealUITests.swift; sourceTree = ""; }; 02AE650B29363DC1005A4AF3 /* BeRealUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BeRealUITestsLaunchTests.swift; sourceTree = ""; }; @@ -66,13 +56,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 02AE64F829363DC1005A4AF3 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 02AE650229363DC1005A4AF3 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -83,6 +66,23 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 024E087A29514D35002C4DF9 /* App */ = { + isa = PBXGroup; + children = ( + 02AE64EE29363DBF005A4AF3 /* BeRealApp.swift */, + ); + path = App; + sourceTree = ""; + }; + 024E087B29514D40002C4DF9 /* Assets */ = { + isa = PBXGroup; + children = ( + 02AE64F229363DC1005A4AF3 /* Assets.xcassets */, + 02AE64F529363DC1005A4AF3 /* Preview Assets.xcassets */, + ); + path = Assets; + sourceTree = ""; + }; 02659B152946AA2700C3AD63 /* UI */ = { isa = PBXGroup; children = ( @@ -116,7 +116,6 @@ 026D9823293B6365009FE888 /* Libraries */, 02784F03293A8331005F839D /* Modules */, 02AE64ED29363DBF005A4AF3 /* BeReal */, - 02AE64FE29363DC1005A4AF3 /* BeRealTests */, 02AE650829363DC1005A4AF3 /* BeRealUITests */, 02AE64EC29363DBF005A4AF3 /* Products */, 4694AA9E293A7C8800D54903 /* Frameworks */, @@ -127,7 +126,6 @@ isa = PBXGroup; children = ( 02AE64EB29363DBF005A4AF3 /* BeReal.app */, - 02AE64FB29363DC1005A4AF3 /* BeRealTests.xctest */, 02AE650529363DC1005A4AF3 /* BeRealUITests.xctest */, ); name = Products; @@ -136,30 +134,13 @@ 02AE64ED29363DBF005A4AF3 /* BeReal */ = { isa = PBXGroup; children = ( - 02AE64EE29363DBF005A4AF3 /* BeRealApp.swift */, - 02AE64F229363DC1005A4AF3 /* Assets.xcassets */, + 024E087A29514D35002C4DF9 /* App */, 02659B152946AA2700C3AD63 /* UI */, - 02AE64F429363DC1005A4AF3 /* Preview Content */, + 024E087B29514D40002C4DF9 /* Assets */, ); path = BeReal; sourceTree = ""; }; - 02AE64F429363DC1005A4AF3 /* Preview Content */ = { - isa = PBXGroup; - children = ( - 02AE64F529363DC1005A4AF3 /* Preview Assets.xcassets */, - ); - path = "Preview Content"; - sourceTree = ""; - }; - 02AE64FE29363DC1005A4AF3 /* BeRealTests */ = { - isa = PBXGroup; - children = ( - 02AE64FF29363DC1005A4AF3 /* BeRealTests.swift */, - ); - path = BeRealTests; - sourceTree = ""; - }; 02AE650829363DC1005A4AF3 /* BeRealUITests */ = { isa = PBXGroup; children = ( @@ -201,24 +182,6 @@ productReference = 02AE64EB29363DBF005A4AF3 /* BeReal.app */; productType = "com.apple.product-type.application"; }; - 02AE64FA29363DC1005A4AF3 /* BeRealTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 02AE651229363DC1005A4AF3 /* Build configuration list for PBXNativeTarget "BeRealTests" */; - buildPhases = ( - 02AE64F729363DC1005A4AF3 /* Sources */, - 02AE64F829363DC1005A4AF3 /* Frameworks */, - 02AE64F929363DC1005A4AF3 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 02AE64FD29363DC1005A4AF3 /* PBXTargetDependency */, - ); - name = BeRealTests; - productName = BeRealTests; - productReference = 02AE64FB29363DC1005A4AF3 /* BeRealTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; 02AE650429363DC1005A4AF3 /* BeRealUITests */ = { isa = PBXNativeTarget; buildConfigurationList = 02AE651529363DC1005A4AF3 /* Build configuration list for PBXNativeTarget "BeRealUITests" */; @@ -251,10 +214,6 @@ 02AE64EA29363DBF005A4AF3 = { CreatedOnToolsVersion = 14.1; }; - 02AE64FA29363DC1005A4AF3 = { - CreatedOnToolsVersion = 14.1; - TestTargetID = 02AE64EA29363DBF005A4AF3; - }; 02AE650429363DC1005A4AF3 = { CreatedOnToolsVersion = 14.1; TestTargetID = 02AE64EA29363DBF005A4AF3; @@ -275,7 +234,6 @@ projectRoot = ""; targets = ( 02AE64EA29363DBF005A4AF3 /* BeReal */, - 02AE64FA29363DC1005A4AF3 /* BeRealTests */, 02AE650429363DC1005A4AF3 /* BeRealUITests */, ); }; @@ -291,13 +249,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 02AE64F929363DC1005A4AF3 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 02AE650329363DC1005A4AF3 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -318,14 +269,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 02AE64F729363DC1005A4AF3 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 02AE650029363DC1005A4AF3 /* BeRealTests.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 02AE650129363DC1005A4AF3 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -338,11 +281,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 02AE64FD29363DC1005A4AF3 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 02AE64EA29363DBF005A4AF3 /* BeReal */; - targetProxy = 02AE64FC29363DC1005A4AF3 /* PBXContainerItemProxy */; - }; 02AE650729363DC1005A4AF3 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 02AE64EA29363DBF005A4AF3 /* BeReal */; @@ -472,7 +410,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"BeReal/Preview Content\""; + DEVELOPMENT_ASSET_PATHS = "\"BeReal/Assets\""; DEVELOPMENT_TEAM = 7FMNM89WKG; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; @@ -506,7 +444,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"BeReal/Preview Content\""; + DEVELOPMENT_ASSET_PATHS = "\"BeReal/Assets\""; DEVELOPMENT_TEAM = 7FMNM89WKG; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; @@ -533,52 +471,6 @@ }; name = Release; }; - 02AE651329363DC1005A4AF3 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 7FMNM89WKG; - GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = "com.rockncode.app.assignment.be-real.tests.unit"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; - SUPPORTS_MACCATALYST = NO; - SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = 1; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/BeReal.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/BeReal"; - }; - name = Debug; - }; - 02AE651429363DC1005A4AF3 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 7FMNM89WKG; - GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = "com.rockncode.app.assignment.be-real.tests.unit"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; - SUPPORTS_MACCATALYST = NO; - SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = 1; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/BeReal.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/BeReal"; - }; - name = Release; - }; 02AE651629363DC1005A4AF3 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -644,15 +536,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 02AE651229363DC1005A4AF3 /* Build configuration list for PBXNativeTarget "BeRealTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 02AE651329363DC1005A4AF3 /* Debug */, - 02AE651429363DC1005A4AF3 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 02AE651529363DC1005A4AF3 /* Build configuration list for PBXNativeTarget "BeRealUITests" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/BeReal/BeRealApp.swift b/BeReal/App/BeRealApp.swift similarity index 100% rename from BeReal/BeRealApp.swift rename to BeReal/App/BeRealApp.swift diff --git a/BeReal/Assets.xcassets/AccentColor.colorset/Contents.json b/BeReal/Assets/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from BeReal/Assets.xcassets/AccentColor.colorset/Contents.json rename to BeReal/Assets/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/BeReal/Assets.xcassets/AppIcon.appiconset/Contents.json b/BeReal/Assets/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from BeReal/Assets.xcassets/AppIcon.appiconset/Contents.json rename to BeReal/Assets/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/BeReal/Assets.xcassets/AppIcon.appiconset/MyFiles.png b/BeReal/Assets/Assets.xcassets/AppIcon.appiconset/MyFiles.png similarity index 100% rename from BeReal/Assets.xcassets/AppIcon.appiconset/MyFiles.png rename to BeReal/Assets/Assets.xcassets/AppIcon.appiconset/MyFiles.png diff --git a/BeReal/Assets.xcassets/Contents.json b/BeReal/Assets/Assets.xcassets/Contents.json similarity index 100% rename from BeReal/Assets.xcassets/Contents.json rename to BeReal/Assets/Assets.xcassets/Contents.json diff --git a/BeReal/Preview Content/Preview Assets.xcassets/Contents.json b/BeReal/Assets/Preview Assets.xcassets/Contents.json similarity index 100% rename from BeReal/Preview Content/Preview Assets.xcassets/Contents.json rename to BeReal/Assets/Preview Assets.xcassets/Contents.json diff --git a/BeRealTests/BeRealTests.swift b/BeRealTests/BeRealTests.swift deleted file mode 100644 index 5dc634c..0000000 --- a/BeRealTests/BeRealTests.swift +++ /dev/null @@ -1,37 +0,0 @@ -// -// BeRealTests.swift -// BeRealTests -// -// Created by Javier Cicchelli on 29/11/2022. -// Copyright © 2022 Röck+Cöde. All rights reserved. -// - -import XCTest -@testable import BeReal - -final class BeRealTests: XCTestCase { - - override func setUpWithError() throws { - // Put setup code here. This method is called before the invocation of each test method in the class. - } - - override func tearDownWithError() throws { - // Put teardown code here. This method is called after the invocation of each test method in the class. - } - - func testExample() throws { - // This is an example of a functional test case. - // Use XCTAssert and related functions to verify your tests produce the correct results. - // Any test you write for XCTest can be annotated as throws and async. - // Mark your test throws to produce an unexpected failure when your test encounters an uncaught error. - // Mark your test async to allow awaiting for asynchronous code to complete. Check the results with assertions afterwards. - } - - func testPerformanceExample() throws { - // This is an example of a performance test case. - self.measure { - // Put the code you want to measure the time of here. - } - } - -}