Move the Tools dir out of the Source dir.

Should help simplify some of the SwiftPM support in the future.

Split out the github action for the service generator into a new workflow.

oops

Author: thomasvl

.github/workflows/cocoapods.yml

@@ -4,15 +4,13 @@ on:
   push:
     branches: [ main ]
     paths:
-    - 'Sources/**'
-    - '!Sources/Tools/**'
+    - 'Source/**'
     - '*.podspec'
     - '.github/workflows/cocoapods.yml'
   pull_request:
     branches: [ main ]
     paths:
-    - 'Sources/**'
-    - '!Sources/Tools/**'
+    - 'Source/**'
     - '*.podspec'
     - '.github/workflows/cocoapods.yml'
   schedule:

.github/workflows/examples.yml

@@ -6,27 +6,27 @@ on:
     paths:
     - 'Examples/**'
     - '!Examples/**/*.md'
-    - 'Sources/GTLRDefines.h'
-    - 'Sources/GeneratedServices/Calendar/**'
-    - 'Sources/GeneratedServices/Drive/**'
-    - 'Sources/GeneratedServices/Storage/**'
-    - 'Sources/GeneratedServices/YouTube/**'
-    - 'Sources/Objects/**'
-    - 'Sources/Utilities/**'
+    - 'Source/GTLRDefines.h'
+    - 'Source/GeneratedServices/Calendar/**'
+    - 'Source/GeneratedServices/Drive/**'
+    - 'Source/GeneratedServices/Storage/**'
+    - 'Source/GeneratedServices/YouTube/**'
+    - 'Source/Objects/**'
+    - 'Source/Utilities/**'
     - '*.podspec'
     - '.github/workflows/examples.yml'
   pull_request:
     branches: [ main ]
     paths:
     - 'Examples/**'
     - '!Examples/**/*.md'
-    - 'Sources/GTLRDefines.h'
-    - 'Sources/GeneratedServices/Calendar/**'
-    - 'Sources/GeneratedServices/Drive/**'
-    - 'Sources/GeneratedServices/Storage/**'
-    - 'Sources/GeneratedServices/YouTube/**'
-    - 'Sources/Objects/**'
-    - 'Sources/Utilities/**'
+    - 'Source/GTLRDefines.h'
+    - 'Source/GeneratedServices/Calendar/**'
+    - 'Source/GeneratedServices/Drive/**'
+    - 'Source/GeneratedServices/Storage/**'
+    - 'Source/GeneratedServices/YouTube/**'
+    - 'Source/Objects/**'
+    - 'Source/Utilities/**'
     - '*.podspec'
     - '.github/workflows/examples.yml'
   schedule:

.github/workflows/service_generator.yml

@@ -0,0 +1,67 @@
+name: SwiftPM
+
+on:
+  push:
+    branches: [ main ]
+    paths:
+    - 'Source/GTLRDefines.h'
+    - 'Source/GeneratedServices/Discovery/**'
+    - 'Source/Objects/**'
+    - 'Source/Utilities/**'
+    - 'Tools/**'
+    - '!Tools/**/*.md'
+    - '!Tools/**/*.py'
+    - '!Tools/GenerateCheckedInServices*'
+    - 'Package*.swift'
+    - '.github/workflows/service_generator.yml'
+  pull_request:
+    branches: [ main ]
+    paths:
+    - 'Source/GTLRDefines.h'
+    - 'Source/GeneratedServices/Discovery/**'
+    - 'Source/Objects/**'
+    - 'Source/Utilities/**'
+    - 'Tools/**'
+    - '!Tools/**/*.md'
+    - '!Tools/**/*.py'
+    - '!Tools/GenerateCheckedInServices*'
+    - 'Package*.swift'
+    - '.github/workflows/service_generator.yml'
+  schedule:
+    # Run the first and fifteenth of every month at 6:32 UTC
+    - cron:  '6 32 1,15 * *'
+
+jobs:
+  swift:
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        CONFIGURATION: ["debug", "release"]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build ServiceGenerator
+      run:  |
+        set -eu
+        cd Tools
+        swift build --configuration ${{ matrix.CONFIGURATION }}
+
+  xcodebuild:
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        CONFIGURATION: ["Debug", "Release"]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build ServiceGenerator
+      run:  |
+        set -eu
+        cd Tools
+        set -o pipefail
+        xcodebuild \
+            -scheme GTLR_ServiceGenerator \
+            -configuration ${{ matrix.CONFIGURATION }} \
+            -destination "platform=macOS" \
+            build \
+          | xcpretty

.github/workflows/swiftpm.yml

@@ -4,13 +4,13 @@ on:
   push:
     branches: [ main ]
     paths:
-    - 'Sources/**'
+    - 'Source/**'
     - 'Package*.swift'
     - '.github/workflows/swiftpm.yml'
   pull_request:
     branches: [ main ]
     paths:
-    - 'Sources/**'
+    - 'Source/**'
     - 'Package*.swift'
     - '.github/workflows/swiftpm.yml'
   schedule:
@@ -32,11 +32,6 @@ jobs:
         set -eu
         swift build --configuration ${{ matrix.CONFIGURATION }}
         swift test --configuration ${{ matrix.CONFIGURATION }}
-    - name: Build ServiceGenerator
-      run:  |
-        set -eu
-        cd Source/Tools
-        swift build --configuration ${{ matrix.CONFIGURATION }}
 
   xcodebuild:
     # Job(s) to build for all the platforms to ensure that is working and the
@@ -74,15 +69,3 @@ jobs:
             -destination "${DESTINATION}" \
             build test \
           | xcpretty
-    - name: Build ServiceGenerator
-      if: ${{ matrix.PLATFORM == 'macos' }}
-      run:  |
-        set -eu
-        cd Source/Tools
-        set -o pipefail
-        xcodebuild \
-            -scheme GTLR_ServiceGenerator \
-            -configuration ${{ matrix.CONFIGURATION }} \
-            -destination "platform=macOS" \
-            build \
-          | xcpretty

.gitignore

@@ -3,7 +3,7 @@
 
 # Xcode
 build/
-Source/Tools/ServiceGenerator/build/
+Tools/ServiceGenerator/build/
 *.pbxuser
 !default.pbxuser
 *.mode1v3

Package.swift

@@ -991,8 +991,7 @@ let package = Package(
             path: "Source",
             exclude: [
                 "GeneratedServices",
-                "Tests",
-                "Tools"
+                "Tests"
             ],
             sources: [
                 "Objects",
@@ -1010,7 +1009,6 @@ let package = Package(
             dependencies: [
                 "GoogleAPIClientForRESTCore"
             ],
-            path: "Source/Tests",
             exclude: [
                 "CompiledTestNoARC.m"
             ],

README.md

@@ -5,6 +5,7 @@
 
 [![CocoaPods](https://github.com/google/google-api-objectivec-client-for-rest/actions/workflows/cocoapods.yml/badge.svg?branch=main)](https://github.com/google/google-api-objectivec-client-for-rest/actions/workflows/cocoapods.yml)
 [![SwiftPM](https://github.com/google/google-api-objectivec-client-for-rest/actions/workflows/swiftpm.yml/badge.svg?branch=main)](https://github.com/google/google-api-objectivec-client-for-rest/actions/workflows/swiftpm.yml)
+[![ServiceGenerator](https://github.com/google/google-api-objectivec-client-for-rest/actions/workflows/service_generator.yml/badge.svg?branch=main)](https://github.com/google/google-api-objectivec-client-for-rest/actions/workflows/service_generator.yml)
 
 Written by Google, this library is a flexible and efficient Objective-C
 framework for accessing JSON APIs.
@@ -26,7 +27,7 @@ In addition to the pre generated classes included with the library, you can
 generate your own source for other services that have a
 [discovery document](https://developers.google.com/discovery/v1/reference/apis#resource-representations)
 by using the
-[ServiceGenerator](https://github.com/google/google-api-objectivec-client-for-rest/tree/main/Source/Tools/ServiceGenerator).
+[ServiceGenerator](https://github.com/google/google-api-objectivec-client-for-rest/tree/main/Tools/ServiceGenerator).
 
 **If you have a problem** or want a new feature to be included in the library,
 please join the

Source/Tests/GenerateTestingSvc

@@ -7,11 +7,9 @@ set -e
 readonly TestsDir=$(dirname "$(echo $0 | sed -e "s,^\([^/]\),$(pwd)/\1,")")
 readonly ScriptName=$(basename "$0")
 
-readonly ServiceGeneratorDir="${TestsDir}/../Tools/ServiceGenerator"
-
-readonly TMP_INSTALL_DIR=$(mktemp -dt "$ScriptName") || exit 1
-trap "rm -rf $TMP_INSTALL_DIR" EXIT HUP INT QUIT TERM
-readonly ServiceGeneratorBinary="${TMP_INSTALL_DIR}/usr/local/bin/ServiceGenerator"
+readonly ToolsDir="${TestsDir}/../../Tools"
+readonly Configuration=debug
+readonly ServiceGeneratorBinary="${ToolsDir}/.build/${Configuration}/ServiceGenerator"
 
 # -----------------------------------------------------------------------------
 
@@ -27,12 +25,7 @@ Banner() {
 # -----------------------------------------------------------------------------
 
 Banner "Ensuring ServiceGenerator is up to date..."
-/usr/bin/xcodebuild \
-  -project "${ServiceGeneratorDir}/ServiceGenerator.xcodeproj" \
-  -scheme ServiceGenerator \
-  -configuration Debug \
-  install \
-  DSTROOT="${TMP_INSTALL_DIR}"
+( cd "${ToolsDir}" && swift build --configuration "${Configuration}" )
 
 # -----------------------------------------------------------------------------
 

Source/Tools/GenerateCheckedInServices renamed to Tools/GenerateCheckedInServices

@@ -8,7 +8,7 @@ set -eu
 readonly ToolsDir=$(dirname "$(echo $0 | sed -e "s,^\([^/]\),$(pwd)/\1,")")
 readonly ScriptName=$(basename "$0")
 
-readonly GeneratedServicesDir="${ToolsDir}/../GeneratedServices"
+readonly GeneratedServicesDir="${ToolsDir}/../Source/GeneratedServices"
 readonly Configuration=debug
 readonly ServiceGeneratorBinary="${ToolsDir}/.build/${Configuration}/ServiceGenerator"
 

Source/Tools/GenerateCheckedInServices-message_filter.json renamed to Tools/GenerateCheckedInServices-message_filter.json

@@ -15,7 +15,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/google/gtm-session-fetcher.git", "1.6.1" ..< "2.0.0"),
-        .package(path: "../..")
+        .package(path: "..")
     ],
     targets: [
         .target(

Source/Tools/Package.swift renamed to Tools/Package.swift

@@ -3,15 +3,13 @@
 If you need to build the generator, the simplest way is to directly pull the code:
 
 ```shell
-$ git clone --recursive \
-    https://github.com/google/google-api-objectivec-client-for-rest.git
-$ cd google-api-objectivec-client-for-rest/Source/Tools/ServiceGenerator
-$ xcodebuild -project ServiceGenerator.xcodeproj -alltargets \
-    -configuration Release build
+$ git clone
+$ cd google-api-objectivec-client-for-rest/Tools/ServiceGenerator
+$ swift build -configuration release
 ```
 
 With Xcode's default preferences, that will create a `build` directory next to the project file;
-and you will find the built generator as `build/Release/ServiceGenerator`.
+and you will find the built generator as `.build/release/ServiceGenerator`.
 
 _NOTE:_ If you are using GTLR from CocoaPods, you likely will want to use the command line
 option: `--gtlrFrameworkName` `GTLR` when generating a custom service so the generated
@@ -21,7 +19,7 @@ framework imports matching the CocoaPod.
 For information on the options, invoke the generator with `--help`:
 
 ```Shell
-$ build/Release/ServiceGenerator --help
+$ .build/release/ServiceGenerator --help
 Usage: ServiceGenerator --outputDir PATH [FLAGS] [ARGS]
 ...lots of usage info...
 ```

Source/Tools/ServiceGenerator/.gitignore renamed to Tools/ServiceGenerator/.gitignore

@@ -83,7 +83,7 @@ def Main(args):
   """Main method."""
   assert not args, 'No args supported on this script!'
   script_dir = os.path.dirname(os.path.realpath(__file__))
-  root_dir = os.path.dirname(os.path.dirname(script_dir))
+  root_dir = os.path.dirname(script_dir)
   podspec_path = os.path.join(root_dir, _PODSPEC_NAME)
   assert os.path.isfile(podspec_path), (
       'Failed to find %r' % _PODSPEC_NAME)

Source/Tools/ServiceGenerator/Public/SGMain.h renamed to Tools/ServiceGenerator/Public/SGMain.h

@@ -108,7 +108,7 @@ def Main(args):
   """Main method."""
   assert not args, 'No args supported on this script!'
   script_dir = os.path.dirname(os.path.realpath(__file__))
-  root_dir = os.path.dirname(os.path.dirname(script_dir))
+  root_dir = os.path.dirname(script_dir)
   package_path = os.path.join(root_dir, _PACKAGE_FILE)
   assert os.path.isfile(package_path), (
       'Failed to find %r' % _PACKAGE_FILE)