diff --git a/.gitignore b/.gitignore index 24f188e..87ff9b0 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ /dist /gen /gradle.properties +/libs /local.properties /out /proguard-project.txt diff --git a/.idea/modules/DataProviderTest.iml b/.idea/modules/DataProviderTest.iml index da1bb05..04987c8 100644 --- a/.idea/modules/DataProviderTest.iml +++ b/.idea/modules/DataProviderTest.iml @@ -19,6 +19,7 @@ + \ No newline at end of file diff --git a/DataProviderTest.ipr b/DataProviderTest.ipr index f765fa8..b1271bf 100644 --- a/DataProviderTest.ipr +++ b/DataProviderTest.ipr @@ -1,5 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -45,7 +93,7 @@ - + @@ -124,6 +172,21 @@ + + + + - + @@ -268,6 +332,7 @@ + @@ -279,6 +344,15 @@ + + + + + + + + + @@ -320,6 +394,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build.gradle b/build.gradle index d123712..35dfcdb 100644 --- a/build.gradle +++ b/build.gradle @@ -27,6 +27,9 @@ dependencies { // testCompile dependency to testCompile 'org.testng:testng:6.8.1' and add // 'test.useTestNG()' to your build script. testCompile 'org.testng:testng:6.9.12' + + // WORKAROUND + testCompile 'com.google.guava:guava:19.0' } test { diff --git a/kobalt/Build.kt.iml b/kobalt/Build.kt.iml new file mode 100644 index 0000000..00b83dc --- /dev/null +++ b/kobalt/Build.kt.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index b6f9f8a..65c2706 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -1,10 +1,6 @@ -import com.beust.kobalt.* -import com.beust.kobalt.plugin.packaging.* -import com.beust.kobalt.plugin.application.* -import com.beust.kobalt.plugin.java.* - -val repos = repos() - +import com.beust.kobalt.plugin.application.application +import com.beust.kobalt.plugin.packaging.assemble +import com.beust.kobalt.project val p = project { @@ -22,22 +18,21 @@ val p = project { } dependencies { -// compile("com.beust:jcommander:1.48") + } dependenciesTest { compile("org.testng:testng:6.9.9") - + // WORKAROUND + compile("com.google.guava:guava:19.0") } assemble { - jar { - } + jar {} } application { mainClass = "com.example.Main" } - } diff --git a/kobalt/wrapper/kobalt-wrapper.properties b/kobalt/wrapper/kobalt-wrapper.properties index 9991cb4..7480643 100644 --- a/kobalt/wrapper/kobalt-wrapper.properties +++ b/kobalt/wrapper/kobalt-wrapper.properties @@ -1 +1 @@ -kobalt.version=0.839 \ No newline at end of file +kobalt.version=0.841 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3a61d85..de2320d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,38 +1,44 @@ - 4.0.0 + 4.0.0 - net.thauvin.erik - DataProviderTest - 1.0-SNAPSHOT - jar + net.thauvin.erik + DataProviderTest + 1.0-SNAPSHOT + jar - DataProviderTest - https://github.com/ethauvin/DataProviderTest + DataProviderTest + https://github.com/ethauvin/DataProviderTest - - UTF-8 - + + UTF-8 + - - - jcenter - bintray - http://jcenter.bintray.com - - + + + jcenter + bintray + http://jcenter.bintray.com + + - - - org.testng - testng - 6.9.12 - test - - - org.apache.maven.surefire - surefire-testng-utils - 2.12.4 - - + + + org.testng + testng + 6.9.12 + test + + + org.apache.maven.surefire + surefire-testng-utils + 2.12.4 + + + + com.google.guava + guava + 19.0 + + \ No newline at end of file