fix project structure so publishes are correct

GradleUp · Feb 15, 2013 · 3b72997 · 3b72997
1 parent 1fd0061
commit 3b72997
Show file tree

Hide file tree

Showing 52 changed files with 4 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ task integTest(type: GradleBuild) {
     dir = file('it')
     tasks = ['clean', 'integTest']
 }
-integTest.dependsOn ':plugin:install'
+integTest.dependsOn ':shadow:install'
 
 subprojects {
 

diff --git a/it/gradle.properties b/it/gradle.properties
@@ -1 +1 @@
-currentVersion=0.7-SNAPSHOT
+currentVersion=0.7
diff --git a/settings.gradle b/settings.gradle
@@ -1,2 +1,2 @@
-rootProject.name = 'shadow'
-include 'plugin'
+rootProject.name = 'gradle-shadow'
+include 'shadow'
diff --git a/plugin/LICENSE → shadow/LICENSE b/plugin/LICENSE → shadow/LICENSE
diff --git a/plugin/NOTICE → shadow/NOTICE b/plugin/NOTICE → shadow/NOTICE
diff --git a/plugin/build.gradle → shadow/build.gradle b/plugin/build.gradle → shadow/build.gradle
diff --git a/...le/api/plugins/shadow/ShadowPlugin.groovy → ...le/api/plugins/shadow/ShadowPlugin.groovy b/...le/api/plugins/shadow/ShadowPlugin.groovy → ...le/api/plugins/shadow/ShadowPlugin.groovy
diff --git a/...dle/api/plugins/shadow/ShadowStats.groovy → ...dle/api/plugins/shadow/ShadowStats.groovy b/...dle/api/plugins/shadow/ShadowStats.groovy → ...dle/api/plugins/shadow/ShadowStats.groovy
diff --git a/...plugins/shadow/ShadowTaskExtension.groovy → ...plugins/shadow/ShadowTaskExtension.groovy b/...plugins/shadow/ShadowTaskExtension.groovy → ...plugins/shadow/ShadowTaskExtension.groovy
diff --git a/...e/api/plugins/shadow/filter/Filter.groovy → ...e/api/plugins/shadow/filter/Filter.groovy b/...e/api/plugins/shadow/filter/Filter.groovy → ...e/api/plugins/shadow/filter/Filter.groovy
diff --git a/...plugins/shadow/filter/SimpleFilter.groovy → ...plugins/shadow/filter/SimpleFilter.groovy b/...plugins/shadow/filter/SimpleFilter.groovy → ...plugins/shadow/filter/SimpleFilter.groovy
diff --git a/.../plugins/shadow/impl/ArchiveFilter.groovy → .../plugins/shadow/impl/ArchiveFilter.groovy b/.../plugins/shadow/impl/ArchiveFilter.groovy → .../plugins/shadow/impl/ArchiveFilter.groovy
diff --git a/...api/plugins/shadow/impl/ArtifactId.groovy → ...api/plugins/shadow/impl/ArtifactId.groovy b/...api/plugins/shadow/impl/ArtifactId.groovy → ...api/plugins/shadow/impl/ArtifactId.groovy
diff --git a/...ugins/shadow/impl/ArtifactSelector.groovy → ...ugins/shadow/impl/ArtifactSelector.groovy b/...ugins/shadow/impl/ArtifactSelector.groovy → ...ugins/shadow/impl/ArtifactSelector.groovy
diff --git a/...pi/plugins/shadow/impl/ArtifactSet.groovy → ...pi/plugins/shadow/impl/ArtifactSet.groovy b/...pi/plugins/shadow/impl/ArtifactSet.groovy → ...pi/plugins/shadow/impl/ArtifactSet.groovy
diff --git a/...dle/api/plugins/shadow/impl/Caster.groovy → ...dle/api/plugins/shadow/impl/Caster.groovy b/...dle/api/plugins/shadow/impl/Caster.groovy → ...dle/api/plugins/shadow/impl/Caster.groovy
diff --git a/.../plugins/shadow/impl/DefaultCaster.groovy → .../plugins/shadow/impl/DefaultCaster.groovy b/.../plugins/shadow/impl/DefaultCaster.groovy → .../plugins/shadow/impl/DefaultCaster.groovy
diff --git a/...gins/shadow/impl/RelocatorRemapper.groovy → ...gins/shadow/impl/RelocatorRemapper.groovy b/...gins/shadow/impl/RelocatorRemapper.groovy → ...gins/shadow/impl/RelocatorRemapper.groovy
diff --git a/.../plugins/shadow/impl/ShadowRequest.groovy → .../plugins/shadow/impl/ShadowRequest.groovy b/.../plugins/shadow/impl/ShadowRequest.groovy → .../plugins/shadow/impl/ShadowRequest.groovy
diff --git a/...lugins/shadow/relocation/Relocator.groovy → ...lugins/shadow/relocation/Relocator.groovy b/...lugins/shadow/relocation/Relocator.groovy → ...lugins/shadow/relocation/Relocator.groovy
diff --git a/.../shadow/relocation/SimpleRelocator.groovy → .../shadow/relocation/SimpleRelocator.groovy b/.../shadow/relocation/SimpleRelocator.groovy → .../shadow/relocation/SimpleRelocator.groovy
diff --git a/...api/plugins/shadow/tasks/KnowsTask.groovy → ...api/plugins/shadow/tasks/KnowsTask.groovy b/...api/plugins/shadow/tasks/KnowsTask.groovy → ...api/plugins/shadow/tasks/KnowsTask.groovy
diff --git a/.../shadow/tasks/OutputSignedLibsTask.groovy → .../shadow/tasks/OutputSignedLibsTask.groovy b/.../shadow/tasks/OutputSignedLibsTask.groovy → .../shadow/tasks/OutputSignedLibsTask.groovy
diff --git a/...pi/plugins/shadow/tasks/ShadowTask.groovy → ...pi/plugins/shadow/tasks/ShadowTask.groovy b/...pi/plugins/shadow/tasks/ShadowTask.groovy → ...pi/plugins/shadow/tasks/ShadowTask.groovy
diff --git a/...s/ApacheLicenseResourceTransformer.groovy → ...s/ApacheLicenseResourceTransformer.groovy b/...s/ApacheLicenseResourceTransformer.groovy → ...s/ApacheLicenseResourceTransformer.groovy
diff --git a/...rs/ApacheNoticeResourceTransformer.groovy → ...rs/ApacheNoticeResourceTransformer.groovy b/...rs/ApacheNoticeResourceTransformer.groovy → ...rs/ApacheNoticeResourceTransformer.groovy
diff --git a/.../transformers/AppendingTransformer.groovy → .../transformers/AppendingTransformer.groovy b/.../transformers/AppendingTransformer.groovy → .../transformers/AppendingTransformer.groovy
diff --git a/...s/ComponentsXmlResourceTransformer.groovy → ...s/ComponentsXmlResourceTransformer.groovy b/...s/ComponentsXmlResourceTransformer.groovy → ...s/ComponentsXmlResourceTransformer.groovy
diff --git a/...ers/DontIncludeResourceTransformer.groovy → ...ers/DontIncludeResourceTransformer.groovy b/...ers/DontIncludeResourceTransformer.groovy → ...ers/DontIncludeResourceTransformer.groovy
diff --git a/...formers/IncludeResourceTransformer.groovy → ...formers/IncludeResourceTransformer.groovy b/...formers/IncludeResourceTransformer.groovy → ...formers/IncludeResourceTransformer.groovy
diff --git a/...ormers/ManifestResourceTransformer.groovy → ...ormers/ManifestResourceTransformer.groovy b/...ormers/ManifestResourceTransformer.groovy → ...ormers/ManifestResourceTransformer.groovy
diff --git a/...ransformers/ServiceFileTransformer.groovy → ...ransformers/ServiceFileTransformer.groovy b/...ransformers/ServiceFileTransformer.groovy → ...ransformers/ServiceFileTransformer.groovy
diff --git a/...ns/shadow/transformers/Transformer.groovy → ...ns/shadow/transformers/Transformer.groovy b/...ns/shadow/transformers/Transformer.groovy → ...ns/shadow/transformers/Transformer.groovy
diff --git a/...ansformers/XmlAppendingTransformer.groovy → ...ansformers/XmlAppendingTransformer.groovy b/...ansformers/XmlAppendingTransformer.groovy → ...ansformers/XmlAppendingTransformer.groovy
diff --git a/...META-INF/gradle-plugins/shadow.properties → ...META-INF/gradle-plugins/shadow.properties b/...META-INF/gradle-plugins/shadow.properties → ...META-INF/gradle-plugins/shadow.properties
diff --git a/plugin/src/main/resources/shadowBanner.txt → shadow/src/main/resources/shadowBanner.txt b/plugin/src/main/resources/shadowBanner.txt → shadow/src/main/resources/shadowBanner.txt
diff --git a/...ins/shadow/filter/SimpleFilterTest.groovy → ...ins/shadow/filter/SimpleFilterTest.groovy b/...ins/shadow/filter/SimpleFilterTest.groovy → ...ins/shadow/filter/SimpleFilterTest.groovy
diff --git a/...gins/shadow/impl/DefaultCasterTest.groovy → ...gins/shadow/impl/DefaultCasterTest.groovy b/...gins/shadow/impl/DefaultCasterTest.groovy → ...gins/shadow/impl/DefaultCasterTest.groovy
diff --git a/...ation/SimpleRelocatorParameterTest.groovy → ...ation/SimpleRelocatorParameterTest.groovy b/...ation/SimpleRelocatorParameterTest.groovy → ...ation/SimpleRelocatorParameterTest.groovy
diff --git a/...dow/relocation/SimpleRelocatorTest.groovy → ...dow/relocation/SimpleRelocatorTest.groovy b/...dow/relocation/SimpleRelocatorTest.groovy → ...dow/relocation/SimpleRelocatorTest.groovy
diff --git a/...acheLicenseResourceTransformerTest.groovy → ...acheLicenseResourceTransformerTest.groovy b/...acheLicenseResourceTransformerTest.groovy → ...acheLicenseResourceTransformerTest.groovy
diff --git a/...eResourceTransformerParameterTests.groovy → ...eResourceTransformerParameterTests.groovy b/...eResourceTransformerParameterTests.groovy → ...eResourceTransformerParameterTests.groovy
diff --git a/...pacheNoticeResourceTransformerTest.groovy → ...pacheNoticeResourceTransformerTest.groovy b/...pacheNoticeResourceTransformerTest.groovy → ...pacheNoticeResourceTransformerTest.groovy
diff --git a/...nsformers/AppendingTransformerTest.groovy → ...nsformers/AppendingTransformerTest.groovy b/...nsformers/AppendingTransformerTest.groovy → ...nsformers/AppendingTransformerTest.groovy
diff --git a/...mponentsXmlResourceTransformerTest.groovy → ...mponentsXmlResourceTransformerTest.groovy b/...mponentsXmlResourceTransformerTest.groovy → ...mponentsXmlResourceTransformerTest.groovy
diff --git a/...ormers/XmlAppendingTransformerTest.groovy → ...ormers/XmlAppendingTransformerTest.groovy b/...ormers/XmlAppendingTransformerTest.groovy → ...ormers/XmlAppendingTransformerTest.groovy
diff --git a/plugin/src/test/jars/plexus-utils-1.4.1.jar → shadow/src/test/jars/plexus-utils-1.4.1.jar b/plugin/src/test/jars/plexus-utils-1.4.1.jar → shadow/src/test/jars/plexus-utils-1.4.1.jar
diff --git a/.../test/jars/test-artifact-1.0-SNAPSHOT.jar → .../test/jars/test-artifact-1.0-SNAPSHOT.jar b/.../test/jars/test-artifact-1.0-SNAPSHOT.jar → .../test/jars/test-artifact-1.0-SNAPSHOT.jar
diff --git a/...c/test/jars/test-project-1.0-SNAPSHOT.jar → ...c/test/jars/test-project-1.0-SNAPSHOT.jar b/...c/test/jars/test-project-1.0-SNAPSHOT.jar → ...c/test/jars/test-project-1.0-SNAPSHOT.jar
diff --git a/plugin/src/test/resources/components-1.xml → shadow/src/test/resources/components-1.xml b/plugin/src/test/resources/components-1.xml → shadow/src/test/resources/components-1.xml
diff --git a/plugin/src/test/resources/components-2.xml → shadow/src/test/resources/components-2.xml b/plugin/src/test/resources/components-2.xml → shadow/src/test/resources/components-2.xml
diff --git a/...rc/test/resources/components-expected.xml → ...rc/test/resources/components-expected.xml b/...rc/test/resources/components-expected.xml → ...rc/test/resources/components-expected.xml