Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Config] Revert merge of ConfigSwift into Config #11769

Merged
merged 3 commits into from
Sep 1, 2023
Merged

[Config] Revert merge of ConfigSwift into Config #11769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8739b41
Revert "[Config] Lock down no-op API's availability for Swift clients…
ncooke3 Sep 1, 2023
15c61ac
Revert "[Config] Refactor Swift sources out of FirebaseRemoteConfigSw…
ncooke3 Sep 1, 2023
db6caba
Revert "[Config] Merge RemoteConfig and its Swift extension in a non-…
ncooke3 Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions FirebaseRemoteConfig.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
30 changes: 0 additions & 30 deletions FirebaseRemoteConfig/Swift/SPMSwiftHeaderWorkaround.swift
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions FirebaseRemoteConfigSwift.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand Down
4 changes: 1 addition & 3 deletions FirebaseRemoteConfig/Swift/Codable.swift → ...seRemoteConfigSwift/Sources/Codable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@
*/

import Foundation
#if SWIFT_PACKAGE
@_exported import FirebaseRemoteConfigInternal
#endif // SWIFT_PACKAGE
import FirebaseRemoteConfig
import FirebaseSharedSwift

public enum RemoteConfigValueCodableError: Error {
Expand Down
20 changes: 0 additions & 20 deletions FirebaseRemoteConfigSwift/Sources/FirebaseRemoteConfigSwift.swift
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions ...ebaseRemoteConfigValueDecoderHelper.swift → ...ebaseRemoteConfigValueDecoderHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions ...ropertyWrapper/RemoteConfigProperty.swift → ...ropertyWrapper/RemoteConfigProperty.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 1 addition & 3 deletions ...Wrapper/RemoteConfigValueObservable.swift → ...Wrapper/RemoteConfigValueObservable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
* limitations under the License.
*/

#if SWIFT_PACKAGE
@_exported import FirebaseRemoteConfigInternal
#endif // SWIFT_PACKAGE
import FirebaseRemoteConfig
import FirebaseCore
import SwiftUI

Expand Down
4 changes: 1 addition & 3 deletions FirebaseRemoteConfig/Swift/Value.swift → ...baseRemoteConfigSwift/Sources/Value.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions FirebaseRemoteConfigSwift/Tests/SwiftAPI/Codable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
// limitations under the License.

import FirebaseRemoteConfig
import FirebaseRemoteConfigSwift

import XCTest

Expand Down
2 changes: 1 addition & 1 deletion FirebaseRemoteConfigSwift/Tests/SwiftAPI/PropertyWrapperDefaultConfigsTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import FirebaseCore
import FirebaseRemoteConfig

import FirebaseRemoteConfigSwift
import XCTest

let ConfigKeyForThisTestOnly = "PropertyWrapperDefaultConfigsTestsKey"
Expand Down
2 changes: 1 addition & 1 deletion FirebaseRemoteConfigSwift/Tests/SwiftAPI/PropertyWrapperTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

import FirebaseRemoteConfig

import FirebaseRemoteConfigSwift
import XCTest

#if compiler(>=5.5.2) && canImport(_Concurrency)
Expand Down
1 change: 1 addition & 0 deletions FirebaseRemoteConfigSwift/Tests/SwiftAPI/Value.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
// limitations under the License.

import FirebaseRemoteConfig
import FirebaseRemoteConfigSwift

import XCTest

Expand Down
19 changes: 5 additions & 14 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down Expand Up @@ -958,7 +956,7 @@ let package = Package(
// MARK: - Firebase Remote Config

.target(
name: "FirebaseRemoteConfigInternal",
name: "FirebaseRemoteConfig",
dependencies: [
"FirebaseCore",
"FirebaseABTesting",
Expand All @@ -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.
Expand All @@ -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: [
Expand Down
Loading