merge :: (#174) image s3 env url

Team-return · Oct 4, 2023 · a17b696 · a17b696
2 parents 1023e0a + a2f1587
commit a17b696
Show file tree

Hide file tree

Showing 192 changed files with 18 additions and 440 deletions.
diff --git a/Plugin/DependencyPlugin/ProjectDescriptionHelpers/Dependency+Target.swift b/Plugin/DependencyPlugin/ProjectDescriptionHelpers/Dependency+Target.swift
@@ -267,10 +267,6 @@ public extension TargetDependency.Domain {
 }
 
 public extension TargetDependency.Core {
-    static let DesignSystem = TargetDependency.project(
-        target: ModulePaths.Core.DesignSystem.targetName(type: .sources),
-        path: .relativeToCore(ModulePaths.Core.DesignSystem.rawValue)
-    )
     static let JwtStoreTesting = TargetDependency.project(
         target: ModulePaths.Core.JwtStore.targetName(type: .testing),
         path: .relativeToCore(ModulePaths.Core.JwtStore.rawValue)
@@ -286,6 +282,10 @@ public extension TargetDependency.Core {
 }
 
 public extension TargetDependency.Shared {
+    static let DesignSystem = TargetDependency.project(
+        target: ModulePaths.Shared.DesignSystem.targetName(type: .sources),
+        path: .relativeToShared(ModulePaths.Shared.DesignSystem.rawValue)
+    )
     static let UtilityModule = TargetDependency.project(
         target: ModulePaths.Shared.UtilityModule.targetName(type: .sources),
         path: .relativeToShared(ModulePaths.Shared.UtilityModule.rawValue)

diff --git a/Plugin/DependencyPlugin/ProjectDescriptionHelpers/ModulePaths.swift b/Plugin/DependencyPlugin/ProjectDescriptionHelpers/ModulePaths.swift
@@ -55,7 +55,6 @@ public extension ModulePaths {
 
 public extension ModulePaths {
     enum Core: String {
-        case DesignSystem
         case JwtStore
 
         func targetName(type: MicroTargetType) -> String {
@@ -66,6 +65,7 @@ public extension ModulePaths {
 
 public extension ModulePaths {
     enum Shared: String {
+        case DesignSystem
         case UtilityModule
         case GlobalThirdPartyLibrary
 

diff --git a/Projects/Core/DesignSystem/Derived/InfoPlists/DesignSystem-Info.plist b/Projects/Core/DesignSystem/Derived/InfoPlists/DesignSystem-Info.plist
diff --git a/Projects/Core/DesignSystem/Derived/InfoPlists/DesignSystemDemoApp-Info.plist b/Projects/Core/DesignSystem/Derived/InfoPlists/DesignSystemDemoApp-Info.plist
diff --git a/Projects/Core/DesignSystem/Derived/Sources/TuistAssets+DesignSystem.swift b/Projects/Core/DesignSystem/Derived/Sources/TuistAssets+DesignSystem.swift
diff --git a/Projects/Core/DesignSystem/Derived/Sources/TuistBundle+DesignSystem.swift b/Projects/Core/DesignSystem/Derived/Sources/TuistBundle+DesignSystem.swift
diff --git a/Projects/Core/DesignSystem/Derived/Sources/TuistBundle+DesignSystemDemoApp.swift b/Projects/Core/DesignSystem/Derived/Sources/TuistBundle+DesignSystemDemoApp.swift