[Config] Consolidate Config and ConfigSwift (#11808)

Author: ncooke3

.github/workflows/remoteconfig.yml

@@ -60,7 +60,7 @@ jobs:
     strategy:
       matrix:
         target: [ios, tvos, macos, watchos]
-        podspec: [FirebaseRemoteConfig.podspec, FirebaseRemoteConfigSwift.podspec --skip-tests]
+        podspec: [FirebaseRemoteConfig.podspec, FirebaseRemoteConfigSwift.podspec --allow-warnings --skip-tests]
     steps:
     - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1

FirebaseRemoteConfig.podspec

@@ -40,13 +40,15 @@ 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'

FirebaseRemoteConfig/CHANGELOG.md

@@ -1,3 +1,9 @@
+# Unreleased
+- [feature] The `FirebaseRemoteConfig` module now contains Firebase Remote
+  Config's Swift-only APIs that were previously only available via the
+  `FirebaseRemoteConfigSwift` extension SDK. See the
+  `FirebaseRemoteConfigSwift` release note from this release for more details.
+
 # 10.12.0
 - [fixed] Fix issue of real-time listeners not being properly removed. (#11458)
 - [fixed] Fix real-time fetches not being able to fetch the latest template due to an in-progress fetch. (#11465)

FirebaseRemoteConfigSwift/Sources/Codable.swift renamed to FirebaseRemoteConfig/Swift/Codable.swift

@@ -15,7 +15,9 @@
  */
 
 import Foundation
-import FirebaseRemoteConfig
+#if SWIFT_PACKAGE
+  @_exported import FirebaseRemoteConfigInternal
+#endif // SWIFT_PACKAGE
 import FirebaseSharedSwift
 
 public enum RemoteConfigValueCodableError: Error {

FirebaseRemoteConfigSwift/Sources/FirebaseRemoteConfigValueDecoderHelper.swift renamed to FirebaseRemoteConfig/Swift/FirebaseRemoteConfigValueDecoderHelper.swift

@@ -15,7 +15,9 @@
  */
 
 import Foundation
-import FirebaseRemoteConfig
+#if SWIFT_PACKAGE
+  @_exported import FirebaseRemoteConfigInternal
+#endif // SWIFT_PACKAGE
 import FirebaseSharedSwift
 
 /// Implement the FirebaseRemoteConfigValueDecoding protocol for the shared Firebase decoder to

FirebaseRemoteConfigSwift/Sources/PropertyWrapper/RemoteConfigProperty.swift renamed to FirebaseRemoteConfig/Swift/PropertyWrapper/RemoteConfigProperty.swift

@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 
-import FirebaseRemoteConfig
+#if SWIFT_PACKAGE
+  @_exported import FirebaseRemoteConfigInternal
+#endif // SWIFT_PACKAGE
+
 import SwiftUI
 
 /// A property wrapper that listens to a Remote Config value.

FirebaseRemoteConfigSwift/Sources/PropertyWrapper/RemoteConfigValueObservable.swift renamed to FirebaseRemoteConfig/Swift/PropertyWrapper/RemoteConfigValueObservable.swift

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-import FirebaseRemoteConfig
+#if SWIFT_PACKAGE
+  @_exported import FirebaseRemoteConfigInternal
+#endif // SWIFT_PACKAGE
 import FirebaseCore
 import SwiftUI
 

FirebaseRemoteConfig/Swift/SPMSwiftHeaderWorkaround.swift

@@ -0,0 +1,30 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#if SWIFT_PACKAGE
+  @_exported import FirebaseRemoteConfigInternal
+
+  // This is a trick to force generate a `FirebaseRemoteConfig-Swift.h` header
+  // that re-exports `FirebaseRemoteConfigInternal` for Objective-C clients. It
+  // is important for the below code to reference a Remote Config symbol defined
+  // in Objective-C as that will import the symbol's module
+  // (`FirebaseRemoteConfigInternal`) in the generated header. This allows
+  // Objective-C clients to import Remote Config's Objective-C API using
+  // `@import FirebaseRemoteConfig;`. This API is not needed for Swift clients
+  // and is therefore unavailable in a Swift context.
+  @available(*, unavailable)
+  @objc public extension RemoteConfig {
+    static var __no_op: () -> Void { {} }
+  }
+#endif // SWIFT_PACKAGE

FirebaseRemoteConfigSwift/Sources/Value.swift renamed to FirebaseRemoteConfig/Swift/Value.swift

@@ -15,7 +15,9 @@
  */
 
 import Foundation
-import FirebaseRemoteConfig
+#if SWIFT_PACKAGE
+  @_exported import FirebaseRemoteConfigInternal
+#endif // SWIFT_PACKAGE
 
 /// Implements subscript overloads to enable Remote Config values to be accessed
 /// in a type-safe way directly from the current config.

FirebaseRemoteConfigSwift.podspec

@@ -39,8 +39,7 @@ app update.
   ]
 
   s.dependency 'FirebaseCore', '~> 10.0'
-  s.dependency 'FirebaseRemoteConfig', '~> 10.0'
-  s.dependency 'FirebaseSharedSwift', '~> 10.0'
+  s.dependency 'FirebaseRemoteConfig', '~> 10.17'
 
   # Run Swift API tests on a real backend.
   s.test_spec 'swift-api-tests' do |swift_api|