diff options
| -rw-r--r-- | .idea/modules.xml | 4 | ||||
| -rw-r--r-- | build/scripts/layouts.gant | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/.idea/modules.xml b/.idea/modules.xml index 62b77e8702b0..c8338a048a61 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -77,8 +77,8 @@ <module fileurl="file://$PROJECT_DIR$/plugins/github/github.iml" filepath="$PROJECT_DIR$/plugins/github/github.iml" group="plugins" /> <module fileurl="file://$PROJECT_DIR$/plugins/google-app-engine/google-app-engine.iml" filepath="$PROJECT_DIR$/plugins/google-app-engine/google-app-engine.iml" group="plugins/GAE" /> <module fileurl="file://$PROJECT_DIR$/plugins/google-app-engine/jps-plugin/google-app-engine-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/google-app-engine/jps-plugin/google-app-engine-jps-plugin.iml" group="plugins/GAE" /> - <module fileurl="file://$PROJECT_DIR$/../studio/cloud/google-cloud-tools.iml" filepath="$PROJECT_DIR$/../studio/cloud/google-cloud-tools.iml" group="plugins/Google" /> - <module fileurl="file://$PROJECT_DIR$/../studio/cloud/login/google-login.iml" filepath="$PROJECT_DIR$/../studio/cloud/login/google-login.iml" group="plugins/Google" /> + <module fileurl="file://$PROJECT_DIR$/../studio/google/cloud/tools/google-cloud-tools.iml" filepath="$PROJECT_DIR$/../studio/google/cloud/tools/google-cloud-tools.iml" group="plugins/Google" /> + <module fileurl="file://$PROJECT_DIR$/../studio/google/cloud/tools/login/google-login.iml" filepath="$PROJECT_DIR$/../studio/google/cloud/tools/login/google-login.iml" group="plugins/Google" /> <module fileurl="file://$PROJECT_DIR$/plugins/gradle/gradle.iml" filepath="$PROJECT_DIR$/plugins/gradle/gradle.iml" group="community/plugins/gradle" /> <module fileurl="file://$PROJECT_DIR$/plugins/gradle/jps-plugin/gradle-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/gradle/jps-plugin/gradle-jps-plugin.iml" group="community/plugins/gradle" /> <module fileurl="file://$PROJECT_DIR$/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml" filepath="$PROJECT_DIR$/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml" group="community/plugins/gradle" /> diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant index 69c817e25d4f..a473114de76e 100644 --- a/build/scripts/layouts.gant +++ b/build/scripts/layouts.gant @@ -580,12 +580,12 @@ def layoutGoogle() { module("google-cloud-tools") } dir("templates") { - fileset(dir: "${home}/../studio/cloud/resources/templates") + fileset(dir: "${home}/../studio/google/cloud/tools/resources/templates") } dir("clientTemplates") { - fileset(dir: "${home}/../studio/cloud/resources/clientTemplates") + fileset(dir: "${home}/../studio/google/cloud/tools/resources/clientTemplates") } - fileset(dir: "${home}/../studio/cloud/lib") { + fileset(dir: "${home}/../studio/google/cloud/tools/lib") { include(name: "**/*.jar") } } @@ -593,7 +593,7 @@ def layoutGoogle() { jar("google-login.jar") { module("google-login") } - fileset(dir: "${home}/../studio/cloud/login/lib") { + fileset(dir: "${home}/../studio/google/cloud/tools/login/lib") { include(name: "**/*.jar") } // Additional libraries that need to be manually copied, see how freemarker |