firebase · ryanwilson · Dec 2, 2020 · Nov 26, 2020 · Nov 26, 2020 · Nov 26, 2020
diff --git a/FirebaseAppDistribution.podspec b/FirebaseAppDistribution.podspec
@@ -27,7 +27,7 @@ iOS SDK for App Distribution for Firebase.
     'FirebaseInstallations/Source/Library/Private/*.h',
     'GoogleDataTransport/GDTCORLibrary/Internal/*.h',
   ]
-  s.public_header_files = base_dir + 'Public/*.h'
+  s.public_header_files = base_dir + 'Public/FirebaseAppDistribution/*.h'
 
   s.dependency 'FirebaseCore', '~> 7.0'
   s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 7.0'

diff --git a/FirebaseAppDistribution/Sources/FIRAppDistributionUIService.m b/FirebaseAppDistribution/Sources/FIRAppDistributionUIService.m
@@ -14,7 +14,7 @@
 
 #import "FirebaseAppDistribution/Sources/FIRAppDistributionUIService.h"
 #import "FirebaseAppDistribution/Sources/FIRFADLogger.h"
-#import "FirebaseAppDistribution/Sources/Public/FIRAppDistribution.h"
+#import "FirebaseAppDistribution/Sources/Public/FirebaseAppDistribution/FIRAppDistribution.h"
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 #import <AuthenticationServices/AuthenticationServices.h>

diff --git a/FirebaseAppDistribution/Sources/Private/FIRAppDistribution.h b/FirebaseAppDistribution/Sources/Private/FIRAppDistribution.h
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #import "FirebaseAppDistribution/Sources/FIRAppDistributionUIService.h"
-#import "FirebaseAppDistribution/Sources/Public/FIRAppDistribution.h"
+#import "FirebaseAppDistribution/Sources/Public/FirebaseAppDistribution/FIRAppDistribution.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/FirebaseAppDistribution/Sources/Private/FIRAppDistributionRelease.h b/FirebaseAppDistribution/Sources/Private/FIRAppDistributionRelease.h
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FirebaseAppDistribution/Sources/Public/FIRAppDistributionRelease.h"
+#import "FirebaseAppDistribution/Sources/Public/FirebaseAppDistribution/FIRAppDistributionRelease.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/...ution/Sources/Public/FIRAppDistribution.h → ...ebaseAppDistribution/FIRAppDistribution.h b/...ution/Sources/Public/FIRAppDistribution.h → ...ebaseAppDistribution/FIRAppDistribution.h
diff --git a/...ources/Public/FIRAppDistributionRelease.h → ...pDistribution/FIRAppDistributionRelease.h b/...ources/Public/FIRAppDistributionRelease.h → ...pDistribution/FIRAppDistributionRelease.h
diff --git a/.../Sources/Public/FirebaseAppDistribution.h → ...AppDistribution/FirebaseAppDistribution.h b/.../Sources/Public/FirebaseAppDistribution.h → ...AppDistribution/FirebaseAppDistribution.h
diff --git a/Package.swift b/Package.swift
@@ -36,6 +36,10 @@ let package = Package(
       name: "FirebaseAuth",
       targets: ["FirebaseAuth"]
     ),
+    .library(
+      name: "FirebaseAppDistribution",
+      targets: ["FirebaseAppDistributionTarget"]
+    ),
     .library(
       name: "FirebaseCrashlytics",
       targets: ["FirebaseCrashlytics"]
@@ -241,6 +245,27 @@ let package = Package(
       checksum: "b0062d581e1bde54a1f6935bde1a49c6718a2a471825e02ab364e2dd8aef69c2"
     ),
 
+    .target(
+      name: "FirebaseAppDistributionTarget",
+      dependencies: [.target(name: "FirebaseAppDistribution",
+                             condition: .when(platforms: [.iOS]))],
+      path: "SwiftPM-PlatformExclude/FirebaseAppDistributionWrap"
+    ),
+
+    .target(
+      name: "FirebaseAppDistribution",
+      dependencies: ["FirebaseCore",
+                     "FirebaseInstallations",
+                     "GoogleDataTransport",
+                     "GoogleUtilities_AppDelegateSwizzler",
+                     "GoogleUtilities_UserDefaults"],
+      path: "FirebaseAppDistribution/Sources",
+      publicHeadersPath: "Public",
+      cSettings: [
+        .headerSearchPath("../../"),
+      ]
+    ),
+
     .target(
       name: "FirebaseAuth",
       dependencies: ["FirebaseCore",
@@ -729,6 +754,7 @@ let package = Package(
       dependencies: [
         "FirebaseAuth",
         "FirebaseABTesting",
+        "FirebaseAppDistribution",
         "Firebase",
         "FirebaseCrashlytics",
         "FirebaseCore",
@@ -770,6 +796,7 @@ let package = Package(
       dependencies: [
         "FirebaseAuth",
         "FirebaseABTesting",
+        "FirebaseAppDistribution",
         "Firebase",
         "FirebaseCrashlytics",
         "FirebaseCore",

diff --git a/SwiftPM-PlatformExclude/FirebaseAppDistributionWrap/dummy.m b/SwiftPM-PlatformExclude/FirebaseAppDistributionWrap/dummy.m
@@ -0,0 +1,18 @@
+// Copyright 2020 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.
+
+#import <TargetConditionals.h>
+#if !TARGET_OS_IOS
+#warning "Firebase App Distribution only supports the iOS platform"
+#endif
diff --git a/SwiftPM-PlatformExclude/FirebaseAppDistributionWrap/include/dummy.h b/SwiftPM-PlatformExclude/FirebaseAppDistributionWrap/include/dummy.h
@@ -0,0 +1,15 @@
+// Copyright 2020 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.
+
+// Prevent a missing umbrella header warning.
diff --git a/SwiftPMTests/objc-import-test/objc-header.m b/SwiftPMTests/objc-import-test/objc-header.m
@@ -14,6 +14,7 @@
 
 #import "Firebase.h"
 #import "FirebaseABTesting/FirebaseABTesting.h"
+#import "FirebaseAppDistribution/FirebaseAppDistribution.h"
 #import "FirebaseAuth/FirebaseAuth.h"
 #import "FirebaseCore/FirebaseCore.h"
 #import "FirebaseCrashlytics/FirebaseCrashlytics.h"
@@ -29,6 +30,7 @@
 
 #import <Firebase.h>
 #import <FirebaseABTesting/FirebaseABTesting.h>
+#import <FirebaseAppDistribution/FirebaseAppDistribution.h>
 #import <FirebaseAuth/FirebaseAuth.h>
 #import <FirebaseCore/FirebaseCore.h>
 #import <FirebaseCrashlytics/FirebaseCrashlytics.h>

diff --git a/SwiftPMTests/objc-import-test/objc-module.m b/SwiftPMTests/objc-import-test/objc-module.m
@@ -14,6 +14,7 @@
 
 @import FirebaseAuth;
 @import FirebaseABTesting;
+@import FirebaseAppDistribution;
 @import Firebase;
 @import FirebaseCrashlytics;
 @import FirebaseCore;

diff --git a/SwiftPMTests/swift-test/main.swift b/SwiftPMTests/swift-test/main.swift
@@ -17,6 +17,7 @@ import Firebase
 import FirebaseCore
 import FirebaseAuth
 import FirebaseABTesting
+import FirebaseAppDistribution
 import FirebaseCrashlytics
 import FirebaseDynamicLinks
 import FirebaseFirestore