Refactored build.gradle

Author: ileasile

build.gradle

@@ -1,5 +1,6 @@
-import com.beust.klaxon.JsonObject
+import groovy.json.JsonOutput
 
+import java.nio.file.Path
 import java.nio.file.Paths
 import java.util.regex.Pattern
 import java.util.stream.Collectors
@@ -19,7 +20,6 @@ buildscript {
         //noinspection DifferentKotlinGradleVersion
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath "com.github.jengelman.gradle.plugins:shadow:$shadowJarVersion"
-        classpath "com.beust:klaxon:5.2"
     }
 }
 
@@ -43,42 +43,54 @@ allprojects {
         testCompile "org.jetbrains.kotlin:kotlin-test:$kotlinVersion"
     }
 
-    String artifactsPathStr = rootProject.findProperty('artifactsPath') ?: 'artifacts'
-    String buildCounterStr = rootProject.findProperty('build.counter') ?: '100500'
-    String buildNumber = rootProject.findProperty('build.number') ?: ''
-    String installPath = rootProject.findProperty('installPath')
-
-    ext.rootPath = rootDir.toPath()
-    ext.packageName = 'kotlin-jupyter-kernel'
-    ext.artifactsDir = rootPath.resolve(artifactsPathStr)
-    ext.isProtectedBranch = isProtectedBranch()
-    ext.versionFileName = "VERSION"
-
-    ext.installPathLocal = installPath ? Paths.get(installPath) :
-            Paths.get(System.properties['user.home'].toString(), ".ipython", "kernels", "kotlin")
-    ext.distributionPath = rootPath.resolve("distrib")
-    ext.distribBuildPath = rootPath.resolve("distrib-build")
-    ext.logosPath = getSubDir(rootPath, "resources", "logos")
-
-    String devAddition = isProtectedBranch ? '' : '.dev1'
-    String defaultBuildNumber = "$baseVersion.$buildCounterStr$devAddition"
-    String buildNumberRegex = "[0-9]+(\\.[0-9]+){3}(\\.dev[0-9]+)?"
-
-    if (!Pattern.matches(buildNumberRegex, buildNumber)) {
-        def versionFile = artifactsDir.resolve(versionFileName).toFile()
-        if (versionFile.exists()) {
-            def lines = versionFile.readLines()
-            assert !lines.empty, "There should be at least one line in VERSION file"
-            buildNumber = lines.first().trim()
+    ext {
+        packageName = "kotlin-jupyter-kernel"
+        versionFileName = "VERSION"
+
+        String artifactsPathStr = rootProject.findProperty('artifactsPath') ?: 'artifacts'
+        String installPath = rootProject.findProperty('installPath')
+
+        //noinspection GroovyAssignabilityCheck
+        rootPath = rootDir.toPath()
+        //noinspection GroovyAssignabilityCheck
+        artifactsDir = rootPath.resolve(artifactsPathStr)
+
+        //noinspection GroovyAssignabilityCheck
+        installPathLocal = installPath ? Paths.get(installPath) :
+                Paths.get(System.properties['user.home'].toString(), ".ipython", "kernels", "kotlin")
+        //noinspection GroovyAssignabilityCheck
+        distributionPath = rootPath.resolve("distrib")
+        //noinspection GroovyAssignabilityCheck
+        distribBuildPath = rootPath.resolve("distrib-build")
+        //noinspection GroovyAssignabilityCheck
+        logosPath = getSubDir(rootPath, "resources", "logos")
+
+        if (project == rootProject) {
+            ext.isProtectedBranch = isProtectedBranch()
+            String buildCounterStr = rootProject.findProperty('build.counter') ?: '100500'
+            String buildNumber = rootProject.findProperty('build.number') ?: ''
+            String devAddition = isProtectedBranch ? '' : '.dev1'
+            String defaultBuildNumber = "$baseVersion.$buildCounterStr$devAddition"
+            String buildNumberRegex = "[0-9]+(\\.[0-9]+){3}(\\.dev[0-9]+)?"
+
+            if (!Pattern.matches(buildNumberRegex, buildNumber)) {
+                def versionFile = artifactsDir.resolve(versionFileName).toFile()
+                if (versionFile.exists()) {
+                    def lines = versionFile.readLines()
+                    assert !lines.empty, "There should be at least one line in VERSION file"
+                    buildNumber = lines.first().trim()
+                } else {
+                    buildNumber = defaultBuildNumber
+                }
+            }
+
+            project.version = buildNumber
+            println("##teamcity[buildNumber '$version']")
         } else {
-            buildNumber = defaultBuildNumber
+            ext.isProtectedBranch = rootProject.isProtectedBranch
+            project.version = rootProject.version
         }
-    }
 
-    project.version = buildNumber
-    println("##teamcity[buildNumber '$version']")
-
-    ext {
         debugPort = 1044
         debuggerConfig = "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$debugPort".toString()
 
@@ -207,24 +219,24 @@ static String makeTaskName(String prefix, Boolean local) {
     return prefix + (local ? "Local" : "Distrib")
 }
 
-static void makeDirs(java.nio.file.Path path) {
+static void makeDirs(Path path) {
     File dir = path.toFile()
     if (!dir.exists()) {
         dir.mkdirs()
     }
 }
 
-static java.nio.file.Path getSubDir(java.nio.file.Path dir, String... subDir) {
+static Path getSubDir(Path dir, String... subDir) {
     def newDir = dir
     for (s in subDir) {
         newDir = newDir.resolve(s)
     }
     return newDir
 }
 
-static void writeJson(Map<String, Object> json, java.nio.file.Path path) {
-    def jsonString = new JsonObject(json).toJsonString(true, false)
-    path.toFile().write(jsonString, 'UTF-8')
+static void writeJson(Map<String, Object> json, Path path) {
+    def str = JsonOutput.prettyPrint(JsonOutput.toJson(json))
+    path.toFile().write(str, 'UTF-8')
 }
 
 void createCleanTasks() {
@@ -241,7 +253,7 @@ void createCleanTasks() {
 createCleanTasks()
 
 @SuppressWarnings("unused")
-void createInstallTasks(Boolean local, java.nio.file.Path specPath, java.nio.file.Path mainInstallPath) {
+void createInstallTasks(Boolean local, Path specPath, Path mainInstallPath) {
     def groupName = local ? localGroup : distribGroup
     def cleanDirTask = getTasks().getByName(makeTaskName(cleanInstallDirTaskPrefix, local))
     def args = [type: Copy, dependsOn: cleanDirTask, group: groupName]
@@ -267,7 +279,7 @@ void createInstallTasks(Boolean local, java.nio.file.Path specPath, java.nio.fil
     }
 }
 
-String createTaskForSpecs(Boolean debug, Boolean local, String group, Task cleanDir, java.nio.file.Path specPath, java.nio.file.Path mainInstallPath) {
+String createTaskForSpecs(Boolean debug, Boolean local, String group, Task cleanDir, Path specPath, Path mainInstallPath) {
     String taskName = makeTaskName(debug ? "createDebugSpecs" : "createSpecs", local)
     task([group: group], taskName) {
         dependsOn cleanDir, shadowJar
@@ -308,7 +320,7 @@ void createMainInstallTask(Boolean debug, Boolean local, String group, String sp
     }
 }
 
-void makeKernelSpec(java.nio.file.Path installPath, Boolean localInstall) {
+void makeKernelSpec(Path installPath, Boolean localInstall) {
     def argv = localInstall ?
             Arrays.asList("python",
                     installPath.resolve(runKernelPy).toString(),
@@ -329,7 +341,7 @@ void makeKernelSpec(java.nio.file.Path installPath, Boolean localInstall) {
     }
 }
 
-void makeJarArgs(java.nio.file.Path installPath, String kernelJarPath, List<String> classPath, String debuggerConfig = "") {
+void makeJarArgs(Path installPath, String kernelJarPath, List<String> classPath, String debuggerConfig = "") {
     writeJson([
             "mainJar": kernelJarPath,
             "classPath": classPath,
@@ -346,8 +358,6 @@ task copyRunKernelPy(type: Copy, dependsOn: cleanInstallDirLocal, group: localGr
 
 createInstallTasks(true, installPathLocal, installPathLocal)
 
-task uninstall(dependsOn: cleanInstallDirLocal, group: localGroup) {
-
-}
+task uninstall(dependsOn: cleanInstallDirLocal, group: localGroup)
 
 apply from: 'distrib.gradle'