From 104d756e73727c2681b154856c9342003010277a Mon Sep 17 00:00:00 2001 From: endroid Date: Wed, 3 Jan 2018 20:54:00 +0000 Subject: [PATCH 1/3] Add endroid/google-api-bundle --- .../2.0/config/packages/endroid_google_api.yaml | 2 ++ endroid/google-api-bundle/2.0/manifest.json | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 endroid/google-api-bundle/2.0/config/packages/endroid_google_api.yaml create mode 100644 endroid/google-api-bundle/2.0/manifest.json diff --git a/endroid/google-api-bundle/2.0/config/packages/endroid_google_api.yaml b/endroid/google-api-bundle/2.0/config/packages/endroid_google_api.yaml new file mode 100644 index 00000000..69c6d02e --- /dev/null +++ b/endroid/google-api-bundle/2.0/config/packages/endroid_google_api.yaml @@ -0,0 +1,2 @@ +endroid_google_api: + api_key: '%env(GOOGLE_API_API_KEY)%' diff --git a/endroid/google-api-bundle/2.0/manifest.json b/endroid/google-api-bundle/2.0/manifest.json new file mode 100644 index 00000000..02f5d775 --- /dev/null +++ b/endroid/google-api-bundle/2.0/manifest.json @@ -0,0 +1,11 @@ +{ + "bundles": { + "Endroid\\GoogleApiBundle\\EndroidGoogleApiBundle": ["all"] + }, + "copy-from-recipe": { + "config/": "%CONFIG_DIR%/" + }, + "env": { + "GOOGLE_API_API_KEY": "" + } +} From fd7f527a5d8f83dff46a3b92ff557d8acf57eff2 Mon Sep 17 00:00:00 2001 From: endroid Date: Sat, 6 Jan 2018 11:11:29 +0000 Subject: [PATCH 2/3] Fix env name --- .../2.0/config/packages/endroid_google_api.yaml | 2 +- endroid/google-api-bundle/2.0/manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/endroid/google-api-bundle/2.0/config/packages/endroid_google_api.yaml b/endroid/google-api-bundle/2.0/config/packages/endroid_google_api.yaml index 69c6d02e..770ad4d8 100644 --- a/endroid/google-api-bundle/2.0/config/packages/endroid_google_api.yaml +++ b/endroid/google-api-bundle/2.0/config/packages/endroid_google_api.yaml @@ -1,2 +1,2 @@ endroid_google_api: - api_key: '%env(GOOGLE_API_API_KEY)%' + api_key: '%env(GOOGLE_API_KEY)%' diff --git a/endroid/google-api-bundle/2.0/manifest.json b/endroid/google-api-bundle/2.0/manifest.json index 02f5d775..4f37a162 100644 --- a/endroid/google-api-bundle/2.0/manifest.json +++ b/endroid/google-api-bundle/2.0/manifest.json @@ -6,6 +6,6 @@ "config/": "%CONFIG_DIR%/" }, "env": { - "GOOGLE_API_API_KEY": "" + "GOOGLE_API_KEY": "" } } From c6c5b4c4a703cbdc19fc35cbad9cfa9072dbe656 Mon Sep 17 00:00:00 2001 From: endroid Date: Sat, 6 Jan 2018 20:20:44 +0000 Subject: [PATCH 3/3] Move recipe to google/apiclient --- .../2.0/config/packages/endroid_google_api.yaml | 2 -- google/apiclient/2.0/config/packages/google_apiclient.yaml | 5 +++++ .../google-api-bundle => google/apiclient}/2.0/manifest.json | 3 --- 3 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 endroid/google-api-bundle/2.0/config/packages/endroid_google_api.yaml create mode 100644 google/apiclient/2.0/config/packages/google_apiclient.yaml rename {endroid/google-api-bundle => google/apiclient}/2.0/manifest.json (56%) diff --git a/endroid/google-api-bundle/2.0/config/packages/endroid_google_api.yaml b/endroid/google-api-bundle/2.0/config/packages/endroid_google_api.yaml deleted file mode 100644 index 770ad4d8..00000000 --- a/endroid/google-api-bundle/2.0/config/packages/endroid_google_api.yaml +++ /dev/null @@ -1,2 +0,0 @@ -endroid_google_api: - api_key: '%env(GOOGLE_API_KEY)%' diff --git a/google/apiclient/2.0/config/packages/google_apiclient.yaml b/google/apiclient/2.0/config/packages/google_apiclient.yaml new file mode 100644 index 00000000..c073b0a0 --- /dev/null +++ b/google/apiclient/2.0/config/packages/google_apiclient.yaml @@ -0,0 +1,5 @@ +services: + Google_Client: + class: Google_Client + calls: + - [setDeveloperKey, ['%env(GOOGLE_API_KEY)%']] diff --git a/endroid/google-api-bundle/2.0/manifest.json b/google/apiclient/2.0/manifest.json similarity index 56% rename from endroid/google-api-bundle/2.0/manifest.json rename to google/apiclient/2.0/manifest.json index 4f37a162..d1ddc21b 100644 --- a/endroid/google-api-bundle/2.0/manifest.json +++ b/google/apiclient/2.0/manifest.json @@ -1,7 +1,4 @@ { - "bundles": { - "Endroid\\GoogleApiBundle\\EndroidGoogleApiBundle": ["all"] - }, "copy-from-recipe": { "config/": "%CONFIG_DIR%/" },