Merge pull request #70 from jomof/master

Simple Kotlin

Author: jomof

.idea/codeStyleSettings.xml

@@ -1,4 +1,5 @@
 apply plugin: 'java'
+apply plugin: 'kotlin'
 group 'io.cdep'
 
 if (System.getenv()["TRAVIS_TAG"] != null && System.getenv()["TRAVIS_TAG"].length() > 0) {
@@ -11,9 +12,13 @@ repositories {
 }
 
 buildscript {
-  repositories {
+    ext.kotlin_version = '1.2.30'
+    repositories {
       jcenter()
   }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
 }
 
 class GenerateBuildInfo extends DefaultTask {
@@ -56,4 +61,15 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.11'
     testCompile group: 'com.google.guava', name: 'guava', version: '20.0'
     testCompile group: 'com.google.truth', name: 'truth', version: '0.31'
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+}
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+compileTestKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 }

.idea/modules/cdep/cdep-cdep_test.iml

@@ -1,4 +1,5 @@
 apply plugin: 'java'
+apply plugin: 'kotlin'
 group 'io.cdep'
 
 if (System.getenv()["TRAVIS_TAG"] != null && System.getenv()["TRAVIS_TAG"].length() > 0) {
@@ -13,4 +14,24 @@ repositories {
 
 dependencies {
     testCompile 'junit:junit:4.11'
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+}
+buildscript {
+    ext.kotlin_version = '1.2.30'
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+compileTestKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 }

bootstrap/build.gradle

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="cdep-work" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="io.cdep" external.system.module.version="dev" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/out" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

build.gradle

@@ -1,4 +1,5 @@
 apply plugin: 'java'
+apply plugin: 'kotlin'
 group 'io.cdep'
 
 
@@ -7,12 +8,16 @@ repositories {
 }
 
 buildscript {
+    ext.kotlin_version = '1.2.30'
     repositories {
         maven {
             url "https://plugins.gradle.org/m2/"
         }
         jcenter()
     }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
 }
 
 
@@ -75,8 +80,19 @@ dependencies {
     testCompile group: 'com.google.truth', name: 'truth', version: '0.31'
     testCompile "org.mockito:mockito-core:2.+"
     testCompile group: 'net.java', name: 'quickcheck', version: '0.6'
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 }
 
 jar {
     from configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
 }
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+compileTestKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}

cdep-work.iml

@@ -472,8 +472,7 @@ private boolean handleShow(@NotNull List<String> args)
     return false;
   }
 
-  private boolean handleShowManifest(@NotNull List<String> args)
-      throws IOException, NoSuchAlgorithmException, URISyntaxException {
+  private boolean handleShowManifest(@NotNull List<String> args) {
     if (args.size() > 0 && "show".equals(args.get(0))) {
       if (args.size() > 1 && "manifest".equals(args.get(1))) {
         assert config != null;
@@ -640,7 +639,7 @@ private FunctionTableExpression getFunctionTableExpression(@NotNull GeneratorEnv
   }
 
   @NotNull
-  private GeneratorEnvironment getGeneratorEnvironment(boolean forceRedownload, boolean ignoreManifestHashes) throws IOException {
+  private GeneratorEnvironment getGeneratorEnvironment(boolean forceRedownload, boolean ignoreManifestHashes) {
     String downloadedPackagesFolder = null;
     String generatedModulesFolder = null;
     if (this.config != null) {
@@ -729,7 +728,7 @@ private void handleCallerID(@NotNull List<String> args) {
   private void handleOverrideBuildSystem(@NotNull List<String> args) {
     for (String overrideBuildSystem : eatStringArgument("-b", "--builder", args)) {
       BuildSystem result = null;
-      for (BuildSystem buildSystem : BuildSystem.values()) {
+      for (BuildSystem buildSystem : BuildSystem.values) {
         if (buildSystem.name.equals(overrideBuildSystem)) {
           result = buildSystem;
         }