mixed-java-kotlin-hello-world: don't depend on SNAPSHOT, don't use Guava

Author: yole

gradle/mixed-java-kotlin-hello-world/build.gradle

@@ -1,12 +1,10 @@
 buildscript {
+  ext.kotlin_version = '1.0.0-rc-1036'
   repositories {
     mavenCentral()
-    maven {
-      url 'http://oss.sonatype.org/content/repositories/snapshots'
-    }
   }
   dependencies {
-    classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:0.1-SNAPSHOT'
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
 }
 
@@ -21,21 +19,16 @@ sourceSets {
 
 repositories {
   mavenCentral()
-  maven {
-    url 'http://oss.sonatype.org/content/repositories/snapshots'
-  }
 }
 
 dependencies {
-  compile 'com.google.guava:guava:12.0'
-  compile 'org.jetbrains.kotlin:kotlin-stdlib:0.1-SNAPSHOT'
-  deployCompile 'com.google.guava:guava:12.0'
+  compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   testCompile  'org.testng:testng:6.8'
-  testCompile 'org.jetbrains.kotlin:kotlin-test-junit:0.1-SNAPSHOT'
+  testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
 }
 
 test.testClassesDir = project.tasks.compileTestKotlin.destinationDir
 
 task wrapper(type: Wrapper) {
-  gradleVersion="1.6"
+  gradleVersion="2.7"
 }

gradle/mixed-java-kotlin-hello-world/gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Wed May 28 14:39:29 MSK 2014
+#Thu Feb 04 17:38:08 CET 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip

gradle/mixed-java-kotlin-hello-world/gradle/wrapper/gradle-wrapper.properties

@@ -42,11 +42,6 @@ case "`uname`" in
     ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -114,6 +109,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

gradle/mixed-java-kotlin-hello-world/gradlew

@@ -1,7 +1,6 @@
 package demo
 
-import com.google.common.base.Joiner
-import java.util.ArrayList
+import java.util.*
 
 class KotlinGreetingJoiner(val greeter: Greeter) {
 
@@ -12,7 +11,6 @@ class KotlinGreetingJoiner(val greeter: Greeter) {
     }
 
     fun getJoinedGreeting(): String {
-        val joiner = Joiner.on(" and ").skipNulls()
-        return "${greeter.getGreeting()} ${joiner.join(names)}"
+        return "${greeter.getGreeting()} ${names.filterNotNull().joinToString(separator = " and ")}"
     }
 }

gradle/mixed-java-kotlin-hello-world/src/main/kotlin/helloWorld.kt

@@ -1,7 +1,5 @@
 package demo 
 
-import com.google.common.primitives.Ints
-import com.google.common.base.Joiner
 import kotlin.test.assertEquals
 import org.junit.Test as test