Canonical directory structure for Functions (#8918)

Author: paulb777

.github/workflows/functions.yml

@@ -3,7 +3,7 @@ name: functions
 on:
   pull_request:
     paths:
-    - 'Functions**'
+    - 'FirebaseFunctions/**'
     - '.github/workflows/functions.yml'
     - 'Interop/Auth/Public/*.h'
     - 'FirebaseMessaging/Sources/Interop/*.h'
@@ -31,7 +31,7 @@ jobs:
     - name: Setup Bundler
       run: scripts/setup_bundler.sh
     - name: Integration Test Server
-      run: Functions/Backend/start.sh synchronous
+      run: FirebaseFunctions/Backend/start.sh synchronous
     - name: Build and test
       run: |
         scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseFunctions.podspec \
@@ -119,19 +119,20 @@ jobs:
     - name: Setup Bundler
       run: scripts/setup_bundler.sh
     - name: Integration Test Server
-      run: Functions/Backend/start.sh synchronous
+      run: FirebaseFunctions/Backend/start.sh synchronous
     - name: PodLibLint Functions Cron
       run: |
         scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb \
           FirebaseFunctions.podspec --platforms=${{ matrix.target }} ${{ matrix.flags }}
 
-  podspec-presubmit:
+  #TODO - reenable once there's a tag with the new directory structure. See #8918 and #8299
+  # podspec-presubmit:
     # Don't run on private repo unless it is a PR.
-    if: github.repository == 'Firebase/firebase-ios-sdk' && github.event.pull_request.merged != true && github.event.action != 'closed'
-    runs-on: macos-11
-    steps:
-    - uses: actions/checkout@v2
-    - name: Setup Bundler
-      run: scripts/setup_bundler.sh
-    - name: Build and test
-      run: scripts/third_party/travis/retry.sh pod spec lint FirebaseFunctions.podspec --skip-tests --sources='https://github.com/firebase/SpecsTesting','https://github.com/firebase/SpecsDev.git','https://github.com/firebase/SpecsStaging.git','https://cdn.cocoapods.org/'
+    # if: github.repository == 'Firebase/firebase-ios-sdk' && github.event.pull_request.merged != true && github.event.action != 'closed'
+    # runs-on: macos-11
+    # steps:
+    # - uses: actions/checkout@v2
+    # - name: Setup Bundler
+    #   run: scripts/setup_bundler.sh
+    # - name: Build and test
+    #   run: scripts/third_party/travis/retry.sh pod spec lint FirebaseFunctions.podspec --skip-tests --sources='https://github.com/firebase/SpecsTesting','https://github.com/firebase/SpecsDev.git','https://github.com/firebase/SpecsStaging.git','https://cdn.cocoapods.org/'

Dangerfile

@@ -92,8 +92,8 @@ has_license_changes = didModify(["LICENSE"])
 @has_dynamiclinks_api_changes = hasChangesIn("FirebaseDynamicLinks/Sources/Public/")
 @has_firestore_changes = hasChangesIn(["Firestore/", "FirebaseFirestore.podspec"])
 @has_firestore_api_changes = hasChangesIn("Firestore/Source/Public/")
-@has_functions_changes = hasChangesIn(["Functions/", "FirebaseFunctions.podspec"])
-@has_functions_api_changes = hasChangesIn("Functions/FirebaseFunctions/Public/")
+@has_functions_changes = hasChangesIn(["FirebaseFunctions/", "FirebaseFunctions.podspec"])
+@has_functions_api_changes = hasChangesIn("FirebaseFunctions/Sources/Public/")
 @has_inappmessaging_changes = hasChangesIn(["FirebaseInAppMessaging"])
 @has_inappmessaging_api_changes = hasChangesIn(["FirebaseInAppMessaging/Sources/Public/"])
 @has_installations_changes = hasChangesIn("FirebaseInstallations")

FirebaseCombineSwift/Tests/Unit/FirebaseCombine-unit-Bridging-Header.h

@@ -22,7 +22,7 @@
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 // Firebase Functions
-#import "Functions/FirebaseFunctions/FIRFunctions+Internal.h"
+#import "FirebaseFunctions/Sources/FIRFunctions+Internal.h"
 
 // Firebase Auth
 #import <FirebaseAuth/FIRAuth.h>

FirebaseFunctions.podspec

@@ -24,13 +24,13 @@ Cloud Functions for Firebase.
   s.prefix_header_file = false
 
   s.source_files = [
-    'Functions/FirebaseFunctions/**/*',
+    'FirebaseFunctions/Sources/**/*',
     'Interop/Auth/Public/*.h',
     'FirebaseAppCheck/Sources/Interop/*.h',
     'FirebaseCore/Sources/Private/*.h',
     'FirebaseMessaging/Sources/Interop/FIRMessagingInterop.h',
   ]
-  s.public_header_files = 'Functions/FirebaseFunctions/Public/FirebaseFunctions/*.h'
+  s.public_header_files = 'FirebaseFunctions/Sources/Public/FirebaseFunctions/*.h'
 
   s.dependency 'FirebaseCore', '~> 8.0'
   s.dependency 'GTMSessionFetcher/Core', '~> 1.5'
@@ -43,8 +43,8 @@ Cloud Functions for Firebase.
   s.test_spec 'unit' do |unit_tests|
     unit_tests.scheme = { :code_coverage => true }
     unit_tests.source_files = [
-      'Functions/Example/Test*/*.[mh]',
-      'Functions/Tests/Unit/Swift/**/*',
+      'FirebaseFunctions/Tests/Unit/*.[mh]',
+      'FirebaseFunctions/Tests/SwiftUnit/**/*',
       'SharedTestUtilities/FIRAuthInteropFake*',
       'SharedTestUtilities/FIRMessagingInteropFake*',
       'SharedTestUtilities/AppCheckFake/*.[mh]',
@@ -53,10 +53,9 @@ Cloud Functions for Firebase.
 
   s.test_spec 'integration' do |int_tests|
     int_tests.scheme = { :code_coverage => true }
-    int_tests.source_files = 'Functions/Example/IntegrationTests/*.[mh]',
-                             'Functions/Example/TestUtils/*.[mh]',
+    int_tests.source_files = 'FirebaseFunctions/Tests/Integration/*.[mh]',
+                             'FirebaseFunctions/Tests/Integration/*.plist',
                              'SharedTestUtilities/FIRAuthInteropFake*',
-                             'SharedTestUtilities/FIRMessagingInteropFake*',
-                             'Functions/Example/GoogleService-Info.plist'
+                             'SharedTestUtilities/FIRMessagingInteropFake*'
   end
 end

Functions/Backend/index.js renamed to FirebaseFunctions/Backend/index.js

@@ -14,7 +14,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "Functions/FirebaseFunctions/Public/FirebaseFunctions/FIRFunctions.h"
+#import "FirebaseFunctions/Sources/Public/FirebaseFunctions/FIRFunctions.h"
 
 @protocol FIRAppCheckInterop;
 @protocol FIRAuthInterop;