More Gradle related setup

SmartsquareGmbH · Nov 28, 2017 · fffc786 · fffc786
1 parent 3305faf
commit fffc786
Show file tree

Hide file tree

Showing 76 changed files with 5 additions and 5 deletions.
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
@@ -1,6 +1,6 @@
 ext {
     gradleVersion = '4.3.1'
-    squitVersion = '1.0.0'
+    squitVersion = '1.0.2'
 
     gradlePublishVersion = '0.9.9'
     bintrayPublishVersion = '1.7.3'

diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include 'library', 'plugin'
+include 'squit-plugin', 'squit-library'
diff --git a/library/build.gradle → squit-library/build.gradle b/library/build.gradle → squit-library/build.gradle
diff --git a/...e/smartsquare/squit/SquitPostProcessor.kt → ...e/smartsquare/squit/SquitPostProcessor.kt b/...e/smartsquare/squit/SquitPostProcessor.kt → ...e/smartsquare/squit/SquitPostProcessor.kt
diff --git a/...de/smartsquare/squit/SquitPreProcessor.kt → ...de/smartsquare/squit/SquitPreProcessor.kt b/...de/smartsquare/squit/SquitPreProcessor.kt → ...de/smartsquare/squit/SquitPreProcessor.kt
diff --git a/plugin/build.gradle → squit-plugin/build.gradle b/plugin/build.gradle → squit-plugin/build.gradle
@@ -34,7 +34,7 @@ configurations {
 }
 
 dependencies {
-    implementation project(':library')
+    implementation project(':squit-library')
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlinVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-html-jvm:$kotlinHtmlVersion"
@@ -45,12 +45,12 @@ dependencies {
     implementation "com.squareup.okhttp3:okhttp:$okhttpVersion"
     implementation "nu.studer:java-ordered-properties:$orderedPropertiesVersion"
     implementation("com.github.wumpz:diffutils:$diffUtilsVersion") {
-        exclude group: 'org.eclipse.jgit'
+        exclude group: 'org.eclipse.jgit', module: '*'
     }
 
     implementation "org.webjars:bootstrap:$bootstrapVersion"
     implementation("org.webjars.npm:diff2html:$diff2htmlVersion") {
-        exclude group: 'org.webjars.npm'
+        exclude group: 'org.webjars.npm', module: '*'
     }
 
     testImplementation gradleTestKit()

diff --git a/...in/de/smartsquare/squit/SquitExtension.kt → ...in/de/smartsquare/squit/SquitExtension.kt b/...in/de/smartsquare/squit/SquitExtension.kt → ...in/de/smartsquare/squit/SquitExtension.kt
diff --git a/...otlin/de/smartsquare/squit/SquitPlugin.kt → ...otlin/de/smartsquare/squit/SquitPlugin.kt b/...otlin/de/smartsquare/squit/SquitPlugin.kt → ...otlin/de/smartsquare/squit/SquitPlugin.kt
diff --git a/...rtsquare/squit/db/ConnectionCollection.kt → ...rtsquare/squit/db/ConnectionCollection.kt b/...rtsquare/squit/db/ConnectionCollection.kt → ...rtsquare/squit/db/ConnectionCollection.kt
diff --git a/...artsquare/squit/db/ConnectionExtension.kt → ...artsquare/squit/db/ConnectionExtension.kt b/...artsquare/squit/db/ConnectionExtension.kt → ...artsquare/squit/db/ConnectionExtension.kt
diff --git a/...quit/entity/SquitDatabaseConfiguration.kt → ...quit/entity/SquitDatabaseConfiguration.kt b/...quit/entity/SquitDatabaseConfiguration.kt → ...quit/entity/SquitDatabaseConfiguration.kt
diff --git a/...smartsquare/squit/entity/SquitMetaInfo.kt → ...smartsquare/squit/entity/SquitMetaInfo.kt b/...smartsquare/squit/entity/SquitMetaInfo.kt → ...smartsquare/squit/entity/SquitMetaInfo.kt
diff --git a/...tsquare/squit/entity/SquitOutputFormat.kt → ...tsquare/squit/entity/SquitOutputFormat.kt b/...tsquare/squit/entity/SquitOutputFormat.kt → ...tsquare/squit/entity/SquitOutputFormat.kt
diff --git a/...artsquare/squit/entity/SquitProperties.kt → ...artsquare/squit/entity/SquitProperties.kt b/...artsquare/squit/entity/SquitProperties.kt → ...artsquare/squit/entity/SquitProperties.kt
diff --git a/...e/smartsquare/squit/entity/SquitResult.kt → ...e/smartsquare/squit/entity/SquitResult.kt b/...e/smartsquare/squit/entity/SquitResult.kt → ...e/smartsquare/squit/entity/SquitResult.kt
diff --git a/...artsquare/squit/entity/SquitResultTree.kt → ...artsquare/squit/entity/SquitResultTree.kt b/...artsquare/squit/entity/SquitResultTree.kt → ...artsquare/squit/entity/SquitResultTree.kt
diff --git a/...lin/de/smartsquare/squit/io/FilesUtils.kt → ...lin/de/smartsquare/squit/io/FilesUtils.kt b/...lin/de/smartsquare/squit/io/FilesUtils.kt → ...lin/de/smartsquare/squit/io/FilesUtils.kt
diff --git a/...rtsquare/squit/report/HtmlReportWriter.kt → ...rtsquare/squit/report/HtmlReportWriter.kt b/...rtsquare/squit/report/HtmlReportWriter.kt → ...rtsquare/squit/report/HtmlReportWriter.kt
diff --git a/.../de/smartsquare/squit/report/SquitBody.kt → .../de/smartsquare/squit/report/SquitBody.kt b/.../de/smartsquare/squit/report/SquitBody.kt → .../de/smartsquare/squit/report/SquitBody.kt
diff --git a/...artsquare/squit/report/SquitDetailBody.kt → ...artsquare/squit/report/SquitDetailBody.kt b/...artsquare/squit/report/SquitDetailBody.kt → ...artsquare/squit/report/SquitDetailBody.kt
diff --git a/...artsquare/squit/report/SquitDetailHead.kt → ...artsquare/squit/report/SquitDetailHead.kt b/...artsquare/squit/report/SquitDetailHead.kt → ...artsquare/squit/report/SquitDetailHead.kt
diff --git a/.../de/smartsquare/squit/report/SquitHead.kt → .../de/smartsquare/squit/report/SquitHead.kt b/.../de/smartsquare/squit/report/SquitHead.kt → .../de/smartsquare/squit/report/SquitHead.kt
diff --git a/...artsquare/squit/report/XmlReportWriter.kt → ...artsquare/squit/report/XmlReportWriter.kt b/...artsquare/squit/report/XmlReportWriter.kt → ...artsquare/squit/report/XmlReportWriter.kt
diff --git a/...square/squit/task/SquitPostProcessTask.kt → ...square/squit/task/SquitPostProcessTask.kt b/...square/squit/task/SquitPostProcessTask.kt → ...square/squit/task/SquitPostProcessTask.kt
diff --git a/...tsquare/squit/task/SquitPreProcessTask.kt → ...tsquare/squit/task/SquitPreProcessTask.kt b/...tsquare/squit/task/SquitPreProcessTask.kt → ...tsquare/squit/task/SquitPreProcessTask.kt
diff --git a/...martsquare/squit/task/SquitRequestTask.kt → ...martsquare/squit/task/SquitRequestTask.kt b/...martsquare/squit/task/SquitRequestTask.kt → ...martsquare/squit/task/SquitRequestTask.kt
diff --git a/...e/smartsquare/squit/task/SquitTestTask.kt → ...e/smartsquare/squit/task/SquitTestTask.kt b/...e/smartsquare/squit/task/SquitTestTask.kt → ...e/smartsquare/squit/task/SquitTestTask.kt
diff --git a/...in/de/smartsquare/squit/util/Constants.kt → ...in/de/smartsquare/squit/util/Constants.kt b/...in/de/smartsquare/squit/util/Constants.kt → ...in/de/smartsquare/squit/util/Constants.kt
diff --git a/...martsquare/squit/util/LoggerExtensions.kt → ...martsquare/squit/util/LoggerExtensions.kt b/...martsquare/squit/util/LoggerExtensions.kt → ...martsquare/squit/util/LoggerExtensions.kt
diff --git a/...e/smartsquare/squit/util/PropertyUtils.kt → ...e/smartsquare/squit/util/PropertyUtils.kt b/...e/smartsquare/squit/util/PropertyUtils.kt → ...e/smartsquare/squit/util/PropertyUtils.kt
diff --git a/.../smartsquare/squit/util/UtilExtensions.kt → .../smartsquare/squit/util/UtilExtensions.kt b/.../smartsquare/squit/util/UtilExtensions.kt → .../smartsquare/squit/util/UtilExtensions.kt
diff --git a/plugin/src/main/resources/squit-detail.css → ...lugin/src/main/resources/squit-detail.css b/plugin/src/main/resources/squit-detail.css → ...lugin/src/main/resources/squit-detail.css
diff --git a/plugin/src/main/resources/squit-detail.js → ...plugin/src/main/resources/squit-detail.js b/plugin/src/main/resources/squit-detail.js → ...plugin/src/main/resources/squit-detail.js
diff --git a/plugin/src/main/resources/squit.css → squit-plugin/src/main/resources/squit.css b/plugin/src/main/resources/squit.css → squit-plugin/src/main/resources/squit.css
diff --git a/plugin/src/main/resources/squit.js → squit-plugin/src/main/resources/squit.js b/plugin/src/main/resources/squit.js → squit-plugin/src/main/resources/squit.js
diff --git a/.../kotlin/de/smartsquare/squit/TestUtils.kt → .../kotlin/de/smartsquare/squit/TestUtils.kt b/.../kotlin/de/smartsquare/squit/TestUtils.kt → .../kotlin/de/smartsquare/squit/TestUtils.kt
diff --git a/...uare/squit/db/ConnectionCollectionSpek.kt → ...uare/squit/db/ConnectionCollectionSpek.kt b/...uare/squit/db/ConnectionCollectionSpek.kt → ...uare/squit/db/ConnectionCollectionSpek.kt
diff --git a/...quare/squit/entity/SquitPropertiesSpek.kt → ...quare/squit/entity/SquitPropertiesSpek.kt b/...quare/squit/entity/SquitPropertiesSpek.kt → ...quare/squit/entity/SquitPropertiesSpek.kt
diff --git a/...quare/squit/entity/SquitResultTreeSpek.kt → ...quare/squit/entity/SquitResultTreeSpek.kt b/...quare/squit/entity/SquitResultTreeSpek.kt → ...quare/squit/entity/SquitResultTreeSpek.kt
diff --git a/...de/smartsquare/squit/io/FilesUtilsSpek.kt → ...de/smartsquare/squit/io/FilesUtilsSpek.kt b/...de/smartsquare/squit/io/FilesUtilsSpek.kt → ...de/smartsquare/squit/io/FilesUtilsSpek.kt
diff --git a/...re/squit/task/SquitPostProcessTaskSpek.kt → ...re/squit/task/SquitPostProcessTaskSpek.kt b/...re/squit/task/SquitPostProcessTaskSpek.kt → ...re/squit/task/SquitPostProcessTaskSpek.kt
diff --git a/...are/squit/task/SquitPreProcessTaskSpek.kt → ...are/squit/task/SquitPreProcessTaskSpek.kt b/...are/squit/task/SquitPreProcessTaskSpek.kt → ...are/squit/task/SquitPreProcessTaskSpek.kt
diff --git a/...square/squit/task/SquitRequestTaskSpek.kt → ...square/squit/task/SquitRequestTaskSpek.kt b/...square/squit/task/SquitRequestTaskSpek.kt → ...square/squit/task/SquitRequestTaskSpek.kt
diff --git a/...artsquare/squit/task/SquitTestTaskSpek.kt → ...artsquare/squit/task/SquitTestTaskSpek.kt b/...artsquare/squit/task/SquitTestTaskSpek.kt → ...artsquare/squit/task/SquitTestTaskSpek.kt
diff --git a/...rtsquare/squit/util/UtilExtensionsSpek.kt → ...rtsquare/squit/util/UtilExtensionsSpek.kt b/...rtsquare/squit/util/UtilExtensionsSpek.kt → ...rtsquare/squit/util/UtilExtensionsSpek.kt
diff --git a/plugin/src/test/resources/db.sql → squit-plugin/src/test/resources/db.sql b/plugin/src/test/resources/db.sql → squit-plugin/src/test/resources/db.sql
diff --git a/...est/resources/expected-report-failure.xml → ...est/resources/expected-report-failure.xml b/...est/resources/expected-report-failure.xml → ...est/resources/expected-report-failure.xml
diff --git a/...in/src/test/resources/expected-report.xml → ...in/src/test/resources/expected-report.xml b/...in/src/test/resources/expected-report.xml → ...in/src/test/resources/expected-report.xml
diff --git a/...urces/invalid-test-project-2/build.gradle → ...urces/invalid-test-project-2/build.gradle b/...urces/invalid-test-project-2/build.gradle → ...urces/invalid-test-project-2/build.gradle
diff --git a/...ject-2/src/test/project/call1/request.xml → ...ject-2/src/test/project/call1/request.xml b/...ject-2/src/test/project/call1/request.xml → ...ject-2/src/test/project/call1/request.xml
diff --git a/...ect-2/src/test/project/call1/response.xml → ...ect-2/src/test/project/call1/response.xml b/...ect-2/src/test/project/call1/response.xml → ...ect-2/src/test/project/call1/response.xml
diff --git a/...ect-2/src/test/project/call1/test_pre.sql → ...ect-2/src/test/project/call1/test_pre.sql b/...ect-2/src/test/project/call1/test_pre.sql → ...ect-2/src/test/project/call1/test_pre.sql
diff --git a/...ject-2/src/test/project/config.properties → ...ject-2/src/test/project/config.properties b/...ject-2/src/test/project/config.properties → ...ject-2/src/test/project/config.properties
diff --git a/...sources/invalid-test-project/build.gradle → ...sources/invalid-test-project/build.gradle b/...sources/invalid-test-project/build.gradle → ...sources/invalid-test-project/build.gradle
diff --git a/...roject/src/test/project/call1/request.xml → ...roject/src/test/project/call1/request.xml b/...roject/src/test/project/call1/request.xml → ...roject/src/test/project/call1/request.xml
diff --git a/...oject/src/test/project/call1/response.xml → ...oject/src/test/project/call1/response.xml b/...oject/src/test/project/call1/response.xml → ...oject/src/test/project/call1/response.xml
diff --git a/...roject/src/test/project/config.properties → ...roject/src/test/project/config.properties b/...roject/src/test/project/config.properties → ...roject/src/test/project/config.properties
diff --git a/plugin/src/test/resources/sample.properties → ...ugin/src/test/resources/sample.properties b/plugin/src/test/resources/sample.properties → ...ugin/src/test/resources/sample.properties
diff --git a/.../test/resources/test-project/build.gradle → .../test/resources/test-project/build.gradle b/.../test/resources/test-project/build.gradle → .../test/resources/test-project/build.gradle
diff --git a/...roject/src/test/project/call1/request.xml → ...roject/src/test/project/call1/request.xml b/...roject/src/test/project/call1/request.xml → ...roject/src/test/project/call1/request.xml
diff --git a/...oject/src/test/project/call1/response.xml → ...oject/src/test/project/call1/response.xml b/...oject/src/test/project/call1/response.xml → ...oject/src/test/project/call1/response.xml
diff --git a/...ject/src/test/project/call1/test_post.sql → ...ject/src/test/project/call1/test_post.sql b/...ject/src/test/project/call1/test_post.sql → ...ject/src/test/project/call1/test_post.sql
diff --git a/...oject/src/test/project/call1/test_pre.sql → ...oject/src/test/project/call1/test_pre.sql b/...oject/src/test/project/call1/test_pre.sql → ...oject/src/test/project/call1/test_pre.sql
diff --git a/...roject/src/test/project/call2/request.xml → ...roject/src/test/project/call2/request.xml b/...roject/src/test/project/call2/request.xml → ...roject/src/test/project/call2/request.xml
diff --git a/...oject/src/test/project/call2/response.xml → ...oject/src/test/project/call2/response.xml b/...oject/src/test/project/call2/response.xml → ...oject/src/test/project/call2/response.xml
diff --git a/.../src/test/project/call3/config.properties → .../src/test/project/call3/config.properties b/.../src/test/project/call3/config.properties → .../src/test/project/call3/config.properties
diff --git a/...roject/src/test/project/call3/request.xml → ...roject/src/test/project/call3/request.xml b/...roject/src/test/project/call3/request.xml → ...roject/src/test/project/call3/request.xml
diff --git a/...oject/src/test/project/call3/response.xml → ...oject/src/test/project/call3/response.xml b/...oject/src/test/project/call3/response.xml → ...oject/src/test/project/call3/response.xml
diff --git a/.../src/test/project/call4/config.properties → .../src/test/project/call4/config.properties b/.../src/test/project/call4/config.properties → .../src/test/project/call4/config.properties
diff --git a/...roject/src/test/project/call4/request.xml → ...roject/src/test/project/call4/request.xml b/...roject/src/test/project/call4/request.xml → ...roject/src/test/project/call4/request.xml
diff --git a/...oject/src/test/project/call4/response.xml → ...oject/src/test/project/call4/response.xml b/...oject/src/test/project/call4/response.xml → ...oject/src/test/project/call4/response.xml
diff --git a/...roject/src/test/project/config.properties → ...roject/src/test/project/config.properties b/...roject/src/test/project/config.properties → ...roject/src/test/project/config.properties
diff --git a/...ject/src/test/project/post_process.groovy → ...ject/src/test/project/post_process.groovy b/...ject/src/test/project/post_process.groovy → ...ject/src/test/project/post_process.groovy
diff --git a/...oject/src/test/project/pre_process.groovy → ...oject/src/test/project/pre_process.groovy b/...oject/src/test/project/pre_process.groovy → ...oject/src/test/project/pre_process.groovy
diff --git a/...oject/src/test/project/test_post_once.sql → ...oject/src/test/project/test_post_once.sql b/...oject/src/test/project/test_post_once.sql → ...oject/src/test/project/test_post_once.sql
diff --git a/...roject/src/test/project/test_pre_once.sql → ...roject/src/test/project/test_pre_once.sql b/...roject/src/test/project/test_pre_once.sql → ...roject/src/test/project/test_pre_once.sql
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		include 'library', 'plugin'
		include 'squit-plugin', 'squit-library'