[Config] Revert merge of ConfigSwift into Config (#11769)

ncooke3 · web-flow · commit acfd28c8afb7 · 2023-09-01T16:12:54.000-04:00
diff --git a/FirebaseRemoteConfig.podspec b/FirebaseRemoteConfig.podspec
@@ -40,15 +40,13 @@ app update.
     'FirebaseABTesting/Sources/Private/*.h',
     'FirebaseCore/Extension/*.h',
     'FirebaseInstallations/Source/Library/Private/*.h',
-    'FirebaseRemoteConfig/Swift/**/*.swift',
   ]
   s.public_header_files = base_dir + 'Public/FirebaseRemoteConfig/*.h'
   s.pod_target_xcconfig = {
     'GCC_C_LANGUAGE_STANDARD' => 'c99',
     'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"'
   }
   s.dependency 'FirebaseABTesting', '~> 10.0'
-  s.dependency 'FirebaseSharedSwift', '~> 10.0'
   s.dependency 'FirebaseCore', '~> 10.0'
   s.dependency 'FirebaseInstallations', '~> 10.0'
   s.dependency 'GoogleUtilities/Environment', '~> 7.8'
diff --git a/FirebaseRemoteConfig/Swift/SPMSwiftHeaderWorkaround.swift b/FirebaseRemoteConfig/Swift/SPMSwiftHeaderWorkaround.swift
diff --git a/FirebaseRemoteConfigSwift.podspec b/FirebaseRemoteConfigSwift.podspec
@@ -39,6 +39,7 @@ app update.
   ]
 
   s.dependency 'FirebaseRemoteConfig', '~> 10.0'
+  s.dependency 'FirebaseSharedSwift', '~> 10.0'
 
   # Run Swift API tests on a real backend.
   s.test_spec 'swift-api-tests' do |swift_api|
diff --git a/FirebaseRemoteConfigSwift/Sources/Codable.swift b/FirebaseRemoteConfigSwift/Sources/Codable.swift
@@ -15,9 +15,7 @@
  */
 
 import Foundation
-#if SWIFT_PACKAGE
-  @_exported import FirebaseRemoteConfigInternal
-#endif // SWIFT_PACKAGE
+import FirebaseRemoteConfig
 import FirebaseSharedSwift
 
 public enum RemoteConfigValueCodableError: Error {
diff --git a/FirebaseRemoteConfigSwift/Sources/FirebaseRemoteConfigSwift.swift b/FirebaseRemoteConfigSwift/Sources/FirebaseRemoteConfigSwift.swift
diff --git a/FirebaseRemoteConfigSwift/Sources/FirebaseRemoteConfigValueDecoderHelper.swift b/FirebaseRemoteConfigSwift/Sources/FirebaseRemoteConfigValueDecoderHelper.swift
@@ -15,9 +15,7 @@
  */
 
 import Foundation
-#if SWIFT_PACKAGE
-  @_exported import FirebaseRemoteConfigInternal
-#endif // SWIFT_PACKAGE
+import FirebaseRemoteConfig
 import FirebaseSharedSwift
 
 /// Implement the FirebaseRemoteConfigValueDecoding protocol for the shared Firebase decoder to
diff --git a/FirebaseRemoteConfigSwift/Sources/PropertyWrapper/RemoteConfigProperty.swift b/FirebaseRemoteConfigSwift/Sources/PropertyWrapper/RemoteConfigProperty.swift
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-#if SWIFT_PACKAGE
-  @_exported import FirebaseRemoteConfigInternal
-#endif // SWIFT_PACKAGE
-
+import FirebaseRemoteConfig
 import SwiftUI
 
 /// A property wrapper that listens to a Remote Config value.
diff --git a/FirebaseRemoteConfigSwift/Sources/PropertyWrapper/RemoteConfigValueObservable.swift b/FirebaseRemoteConfigSwift/Sources/PropertyWrapper/RemoteConfigValueObservable.swift
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-#if SWIFT_PACKAGE
-  @_exported import FirebaseRemoteConfigInternal
-#endif // SWIFT_PACKAGE
+import FirebaseRemoteConfig
 import FirebaseCore
 import SwiftUI
 
diff --git a/FirebaseRemoteConfigSwift/Sources/Value.swift b/FirebaseRemoteConfigSwift/Sources/Value.swift
@@ -15,9 +15,7 @@
  */
 
 import Foundation
-#if SWIFT_PACKAGE
-  @_exported import FirebaseRemoteConfigInternal
-#endif // SWIFT_PACKAGE
+import FirebaseRemoteConfig
 
 /// Implements subscript overloads to enable Remote Config values to be accessed
 /// in a type-safe way directly from the current config.
diff --git a/FirebaseRemoteConfigSwift/Tests/SwiftAPI/Codable.swift b/FirebaseRemoteConfigSwift/Tests/SwiftAPI/Codable.swift
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import FirebaseRemoteConfig
+import FirebaseRemoteConfigSwift
 
 import XCTest
 
diff --git a/FirebaseRemoteConfigSwift/Tests/SwiftAPI/PropertyWrapperDefaultConfigsTests.swift b/FirebaseRemoteConfigSwift/Tests/SwiftAPI/PropertyWrapperDefaultConfigsTests.swift
@@ -16,7 +16,7 @@
 
 import FirebaseCore
 import FirebaseRemoteConfig
-
+import FirebaseRemoteConfigSwift
 import XCTest
 
 let ConfigKeyForThisTestOnly = "PropertyWrapperDefaultConfigsTestsKey"
diff --git a/FirebaseRemoteConfigSwift/Tests/SwiftAPI/PropertyWrapperTests.swift b/FirebaseRemoteConfigSwift/Tests/SwiftAPI/PropertyWrapperTests.swift
@@ -15,7 +15,7 @@
  */
 
 import FirebaseRemoteConfig
-
+import FirebaseRemoteConfigSwift
 import XCTest
 
 #if compiler(>=5.5.2) && canImport(_Concurrency)
diff --git a/FirebaseRemoteConfigSwift/Tests/SwiftAPI/Value.swift b/FirebaseRemoteConfigSwift/Tests/SwiftAPI/Value.swift
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import FirebaseRemoteConfig
+import FirebaseRemoteConfigSwift
 
 import XCTest
 
diff --git a/Package.swift b/Package.swift
@@ -892,9 +892,7 @@ let package = Package(
       dependencies: [
         "FirebaseCore",
         "FirebaseInstallations",
-        // TODO(ncooke3): Consider if this should import the merged module
-        // (`FirebaseRemoteConfig`).
-        "FirebaseRemoteConfigInternal",
+        "FirebaseRemoteConfig",
         "FirebaseSessions",
         .product(name: "GoogleDataTransport", package: "GoogleDataTransport"),
         .product(name: "GULEnvironment", package: "GoogleUtilities"),
@@ -958,7 +956,7 @@ let package = Package(
     // MARK: - Firebase Remote Config
 
     .target(
-      name: "FirebaseRemoteConfigInternal",
+      name: "FirebaseRemoteConfig",
       dependencies: [
         "FirebaseCore",
         "FirebaseABTesting",
@@ -973,7 +971,7 @@ let package = Package(
     ),
     .testTarget(
       name: "RemoteConfigUnit",
-      dependencies: ["FirebaseRemoteConfigInternal", .product(name: "OCMock", package: "ocmock")],
+      dependencies: ["FirebaseRemoteConfig", .product(name: "OCMock", package: "ocmock")],
       path: "FirebaseRemoteConfig/Tests/Unit",
       exclude: [
         // Need to be evaluated/ported to RC V2.
@@ -992,24 +990,17 @@ let package = Package(
         .headerSearchPath("../../.."),
       ]
     ),
-    .target(
-      name: "FirebaseRemoteConfig",
-      dependencies: [
-        "FirebaseRemoteConfigInternal",
-        "FirebaseSharedSwift",
-      ],
-      path: "FirebaseRemoteConfig/Swift"
-    ),
     .target(
       name: "FirebaseRemoteConfigSwift",
       dependencies: [
         "FirebaseRemoteConfig",
+        "FirebaseSharedSwift",
       ],
       path: "FirebaseRemoteConfigSwift/Sources"
     ),
     .testTarget(
       name: "RemoteConfigFakeConsole",
-      dependencies: ["FirebaseRemoteConfig",
+      dependencies: ["FirebaseRemoteConfigSwift",
                      "RemoteConfigFakeConsoleObjC"],
       path: "FirebaseRemoteConfigSwift/Tests",
       exclude: [

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ app update.`
`39`	`39`	`]`
`40`	`40`
`41`	`41`	`s.dependency 'FirebaseRemoteConfig', '~> 10.0'`
	`42`	`+ s.dependency 'FirebaseSharedSwift', '~> 10.0'`
`42`	`43`
`43`	`44`	`# Run Swift API tests on a real backend.`
`44`	`45`	`s.test_spec 'swift-api-tests' do \|swift_api\|`