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.

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

Update to namespaced GoogleUtilities #7409

Merged
merged 2 commits into from
Jan 29, 2021
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
49 changes: 25 additions & 24 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,13 @@ let package = Package(
.package(
name: "GoogleAppMeasurement",
url: "https://github.com/google/GoogleAppMeasurement.git",
.exact("7.5.0")
.exact("7.5.1-test")
maksymmalyhin marked this conversation as resolved.
Show resolved Hide resolved
),
.package(
name: "GoogleUtilities",
url: "https://github.com/google/GoogleUtilities.git",
"7.2.0" ..< "8.0.0"
.exact("7.2.1-test")
// "7.2.0" ..< "8.0.0"
),
.package(
name: "GTMSessionFetcher",
Expand Down Expand Up @@ -149,8 +150,8 @@ let package = Package(
dependencies: [
"Firebase",
"FirebaseCoreDiagnostics",
.product(name: "Environment", package: "GoogleUtilities"),
.product(name: "Logger", package: "GoogleUtilities"),
.product(name: "GULEnvironment", package: "GoogleUtilities"),
.product(name: "GULLogger", package: "GoogleUtilities"),
],
path: "FirebaseCore/Sources",
publicHeadersPath: "Public",
Expand All @@ -177,8 +178,8 @@ let package = Package(
name: "FirebaseCoreDiagnostics",
dependencies: [
"GoogleDataTransport",
.product(name: "Environment", package: "GoogleUtilities"),
.product(name: "Logger", package: "GoogleUtilities"),
.product(name: "GULEnvironment", package: "GoogleUtilities"),
.product(name: "GULLogger", package: "GoogleUtilities"),
.product(name: "nanopb", package: "nanopb"),
],
path: "Firebase/CoreDiagnostics/FIRCDLibrary",
Expand Down Expand Up @@ -225,10 +226,10 @@ let package = Package(
condition: .when(platforms: [.iOS])),
"FirebaseCore",
"FirebaseInstallations",
.product(name: "AppDelegateSwizzler", package: "GoogleUtilities"),
.product(name: "MethodSwizzler", package: "GoogleUtilities"),
.product(name: "NSData", package: "GoogleUtilities"),
.product(name: "Network", package: "GoogleUtilities"),
.product(name: "GULAppDelegateSwizzler", package: "GoogleUtilities"),
.product(name: "GULMethodSwizzler", package: "GoogleUtilities"),
.product(name: "GULNSData", package: "GoogleUtilities"),
.product(name: "GULNetwork", package: "GoogleUtilities"),
.product(name: "nanopb", package: "nanopb"),
],
path: "FirebaseAnalyticsWrapper",
Expand Down Expand Up @@ -257,8 +258,8 @@ let package = Package(
"FirebaseCore",
"FirebaseInstallations",
"GoogleDataTransport",
.product(name: "AppDelegateSwizzler", package: "GoogleUtilities"),
.product(name: "UserDefaults", package: "GoogleUtilities"),
.product(name: "GULAppDelegateSwizzler", package: "GoogleUtilities"),
.product(name: "GULUserDefaults", package: "GoogleUtilities"),
],
path: "FirebaseAppDistribution/Sources",
publicHeadersPath: "Public",
Expand All @@ -280,8 +281,8 @@ let package = Package(
name: "FirebaseAuth",
dependencies: [
"FirebaseCore",
.product(name: "AppDelegateSwizzler", package: "GoogleUtilities"),
.product(name: "Environment", package: "GoogleUtilities"),
.product(name: "GULAppDelegateSwizzler", package: "GoogleUtilities"),
.product(name: "GULEnvironment", package: "GoogleUtilities"),
.product(name: "GTMSessionFetcherCore", package: "GTMSessionFetcher"),
],
path: "FirebaseAuth/Sources",
Expand Down Expand Up @@ -551,7 +552,7 @@ let package = Package(
"FirebaseCore",
"FirebaseInstallations",
"FirebaseABTesting",
.product(name: "Environment", package: "GoogleUtilities"),
.product(name: "GULEnvironment", package: "GoogleUtilities"),
.product(name: "nanopb", package: "nanopb"),
],
path: "FirebaseInAppMessaging/Sources",
Expand All @@ -574,8 +575,8 @@ let package = Package(
dependencies: [
"FirebaseCore",
"FirebaseInstallations",
.product(name: "Environment", package: "GoogleUtilities"),
.product(name: "UserDefaults", package: "GoogleUtilities"),
.product(name: "GULEnvironment", package: "GoogleUtilities"),
.product(name: "GULUserDefaults", package: "GoogleUtilities"),
],
path: "Firebase/InstanceID",
exclude: [
Expand All @@ -592,8 +593,8 @@ let package = Package(
dependencies: [
"FirebaseCore",
.product(name: "FBLPromises", package: "Promises"),
.product(name: "Environment", package: "GoogleUtilities"),
.product(name: "UserDefaults", package: "GoogleUtilities"),
.product(name: "GULEnvironment", package: "GoogleUtilities"),
.product(name: "GULUserDefaults", package: "GoogleUtilities"),
],
path: "FirebaseInstallations/Source/Library",
publicHeadersPath: "Public",
Expand Down Expand Up @@ -631,10 +632,10 @@ let package = Package(
dependencies: [
"FirebaseCore",
"FirebaseInstanceID",
.product(name: "AppDelegateSwizzler", package: "GoogleUtilities"),
.product(name: "Environment", package: "GoogleUtilities"),
.product(name: "Reachability", package: "GoogleUtilities"),
.product(name: "UserDefaults", package: "GoogleUtilities"),
.product(name: "GULAppDelegateSwizzler", package: "GoogleUtilities"),
.product(name: "GULEnvironment", package: "GoogleUtilities"),
.product(name: "GULReachability", package: "GoogleUtilities"),
.product(name: "GULUserDefaults", package: "GoogleUtilities"),
],
path: "FirebaseMessaging/Sources",
publicHeadersPath: "Public",
Expand Down Expand Up @@ -680,7 +681,7 @@ let package = Package(
"FirebaseCore",
"FirebaseABTesting",
"FirebaseInstallations",
.product(name: "NSData", package: "GoogleUtilities"),
.product(name: "GULNSData", package: "GoogleUtilities"),
],
path: "FirebaseRemoteConfig/Sources",
publicHeadersPath: "Public",
Expand Down