Merge ah/appcheck-interop into ah/appcheck-settings

andrewheard · andrewheard · commit 3c68661be5ea · 2023-06-06T13:17:34.000-04:00
commit be8e01f Author: Andrew Heard <andrewheard@google.com> Date: Tue Jun 6 13:05:11 2023 -0400 Fix integration tests `source_files` commit af314f8 Author: Andrew Heard <andrewheard@google.com> Date: Tue Jun 6 11:05:25 2023 -0400 Remove AppCheckInterop headers from AppCheck SDK Removed the headers in `AppCheck/Interop` from the App Check SDK `source_files`. commit 256f5f0 Author: Andrew Heard <andrewheard@google.com> Date: Fri Jun 2 11:27:12 2023 -0400 [App Check] Rename symbols in GACAppCheckLogger (#11381) The constants in `GACAppCheckLogger` conflict with those in `FIRAppCheckLogger`.
diff --git a/AppCheck.podspec b/AppCheck.podspec
@@ -36,7 +36,6 @@ Pod::Spec.new do |s|
 
   s.source_files = [
     base_dir + 'Sources/**/*.[mh]',
-    base_dir + 'Interop/*.h',
   ]
   s.public_header_files = base_dir + 'Sources/Public/AppCheck/*.h'
 
@@ -86,6 +85,7 @@ Pod::Spec.new do |s|
     integration_tests.source_files = [
       base_dir + 'Tests/Integration/**/*.[mh]',
       base_dir + 'Tests/Integration/**/*.[mh]',
+      'FirebaseCore/Extension/*.h',
     ]
     integration_tests.resources = base_dir + 'Tests/Fixture/**/*'
     integration_tests.dependency 'FirebaseCore', '~> 10.0'
diff --git a/AppCheck/Interop/Public/AppCheckInterop/AppCheckInterop.h b/AppCheck/Interop/Public/AppCheckInterop/AppCheckInterop.h
@@ -0,0 +1,18 @@
+/*
+ * 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.
+ */
+
+#import "GACAppCheckInterop.h"
+#import "GACAppCheckTokenResultInterop.h"
diff --git a/AppCheck/Interop/Public/AppCheckInterop/GACAppCheckInterop.h b/AppCheck/Interop/Public/AppCheckInterop/GACAppCheckInterop.h
diff --git a/AppCheck/Interop/Public/AppCheckInterop/GACAppCheckTokenResultInterop.h b/AppCheck/Interop/Public/AppCheckInterop/GACAppCheckTokenResultInterop.h
diff --git a/AppCheck/Sources/Core/GACAppCheck.m b/AppCheck/Sources/Core/GACAppCheck.m
@@ -22,6 +22,8 @@
 #import "FBLPromises.h"
 #endif
 
+#import <AppCheckInterop/AppCheckInterop.h>
+
 #import "AppCheck/Sources/Public/AppCheck/GACAppCheckErrors.h"
 #import "AppCheck/Sources/Public/AppCheck/GACAppCheckProvider.h"
 #import "AppCheck/Sources/Public/AppCheck/GACAppCheckSettings.h"
@@ -34,9 +36,6 @@
 #import "AppCheck/Sources/Core/TokenRefresh/GACAppCheckTokenRefreshResult.h"
 #import "AppCheck/Sources/Core/TokenRefresh/GACAppCheckTokenRefresher.h"
 
-#import "AppCheck/Interop/GACAppCheckInterop.h"
-#import "AppCheck/Interop/GACAppCheckTokenResultInterop.h"
-
 NS_ASSUME_NONNULL_BEGIN
 
 /// A notification with the specified name is sent to the default notification center
diff --git a/AppCheck/Sources/Core/GACAppCheckTokenResult.h b/AppCheck/Sources/Core/GACAppCheckTokenResult.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "AppCheck/Interop/GACAppCheckTokenResultInterop.h"
+#import <AppCheckInterop/AppCheckInterop.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/AppCheck/Sources/Public/AppCheck/GACAppCheck.h b/AppCheck/Sources/Public/AppCheck/GACAppCheck.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-@import AppCheckInterop;
+#import <AppCheckInterop/AppCheckInterop.h>
 
 @class GACAppCheckToken;
 @protocol GACAppCheckProvider;
diff --git a/AppCheck/Tests/Unit/Core/GACAppCheckTests.m b/AppCheck/Tests/Unit/Core/GACAppCheckTests.m
@@ -25,9 +25,6 @@
 #import "AppCheck/Sources/Public/AppCheck/GACAppCheckProvider.h"
 #import "AppCheck/Sources/Public/AppCheck/GACAppCheckSettings.h"
 
-#import "AppCheck/Interop/GACAppCheckInterop.h"
-#import "AppCheck/Interop/GACAppCheckTokenResultInterop.h"
-
 #import "AppCheck/Sources/Core/Errors/GACAppCheckErrorUtil.h"
 #import "AppCheck/Sources/Core/GACAppCheckToken+Internal.h"
 #import "AppCheck/Sources/Core/GACAppCheckTokenResult.h"
diff --git a/AppCheck/Tests/Utils/AppCheckFake/GACAppCheckFake.h b/AppCheck/Tests/Utils/AppCheckFake/GACAppCheckFake.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "AppCheck/Interop/GACAppCheckInterop.h"
+#import <AppCheckInterop/AppCheckInterop.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/AppCheck/Tests/Utils/AppCheckFake/GACAppCheckTokenResultFake.h b/AppCheck/Tests/Utils/AppCheckFake/GACAppCheckTokenResultFake.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "AppCheck/Interop/GACAppCheckTokenResultInterop.h"
+#import <AppCheckInterop/AppCheckInterop.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/AppCheckInterop.podspec b/AppCheckInterop.podspec
@@ -25,6 +25,8 @@ Pod::Spec.new do |s|
   s.tvos.deployment_target = '12.0'
   s.watchos.deployment_target = '6.0'
 
-  s.source_files = 'AppCheck/Interop/*.[hm]'
-  s.public_header_files = 'AppCheck/Interop/*.h'
+  base_dir = "AppCheck/Interop/"
+
+  s.source_files = base_dir + '**/*.[mh]'
+  s.public_header_files = base_dir + 'Public/AppCheckInterop/*.h'
 end
diff --git a/Package.swift b/Package.swift
@@ -1338,7 +1338,7 @@ let package = Package(
       exclude: [
         "CMakeLists.txt",
       ],
-      publicHeadersPath: ".",
+      publicHeadersPath: "Public",
       cSettings: [
         .headerSearchPath("../../"),
       ]

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ Pod::Spec.new do \|s\|`
`36`	`36`
`37`	`37`	`s.source_files = [`
`38`	`38`	`base_dir + 'Sources/*/.[mh]',`
`39`		`- base_dir + 'Interop/*.h',`
`40`	`39`	`]`
`41`	`40`	`s.public_header_files = base_dir + 'Sources/Public/AppCheck/*.h'`
`42`	`41`
`@@ -86,6 +85,7 @@ Pod::Spec.new do \|s\|`
`86`	`85`	`integration_tests.source_files = [`
`87`	`86`	`base_dir + 'Tests/Integration/*/.[mh]',`
`88`	`87`	`base_dir + 'Tests/Integration/*/.[mh]',`
	`88`	`+ 'FirebaseCore/Extension/*.h',`
`89`	`89`	`]`
`90`	`90`	`integration_tests.resources = base_dir + 'Tests/Fixture/*/'`
`91`	`91`	`integration_tests.dependency 'FirebaseCore', '~> 10.0'`