Merge pull request #149 from MovingBlocks/kotlin

convert main build.gradle to build.gradle.kts

Author: soloturn

README.md

@@ -2,3 +2,13 @@
 A family of libraries providing a variety of core capabilities for use by games and game engines.
 
 For documentations and usage examples, see https://github.com/MovingBlocks/gestalt/wiki
+
+## Development
+To build locally, use `gradlew jar`.
+### Android Set-Up (optional)
+To build `gestalt-android`, you will need to: 
+* Download the Android SDK and use the `sdkmanager` tool to install the API 30 build tools.
+* Create a `local.properties` file in the repository root containing:
+`sdk.dir=<SDK_ROOT>`,
+where <SDK_ROOT> is the directory in which you installed the Android SDK.
+

build.gradle renamed to build.gradle.kts

@@ -10,12 +10,12 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.1'
+        classpath("com.android.tools.build:gradle:7.4.1")
     }
 }
 
 plugins {
-    id 'idea'
+    id("idea")
 }
 
 allprojects {
@@ -25,24 +25,24 @@ allprojects {
 
         // Terasology Artifactory instance for libs not readily available elsewhere plus our own libs
         maven {
-            def repoViaEnv = System.getenv()["RESOLUTION_REPO"]
+            val repoViaEnv = System.getenv("RESOLUTION_REPO")
             if (rootProject.hasProperty("alternativeResolutionRepo")) {
                 // If the user supplies an alternative repo via gradle.properties then use that
-                name "from alternativeResolutionRepo property"
-                url alternativeResolutionRepo
-            } else if (repoViaEnv != null && repoViaEnv != "") {
-                name "from \$RESOLUTION_REPO"
-                url = repoViaEnv
+                name = "from alternativeResolutionRepo property"
+                url = uri(rootProject.property("alternativeResolutionRepo") as String)
+            } else if (!repoViaEnv.isNullOrEmpty()) {
+                name = "from \$RESOLUTION_REPO"
+                url = uri(repoViaEnv)
             } else {
                 // Our default is the main virtual repo containing everything except repos for testing Artifactory itself
-                name "Terasology Artifactory"
-                url "https://artifactory.terasology.io/artifactory/virtual-repo-live"
+                name = "Terasology Artifactory"
+                url = uri("https://artifactory.terasology.io/artifactory/virtual-repo-live")
             }
         }
 
         // SemVer lib
         maven {
-            url 'https://heisluft.de/maven'
+            url = uri("https://heisluft.de/maven")
         }
     }
 }

gestalt-android/build.gradle

@@ -146,8 +146,6 @@ project.afterEvaluate {
                         }
                     }
 
-                    // List all "compile" dependencies (for old Gradle)
-                    configurations.compile.getDependencies().each { dep -> addDependency(dep, "compile") }
                     // List all "api" dependencies (for new Gradle) as "compile" dependencies
                     configurations.api.getDependencies().each { dep -> addDependency(dep, "compile") }
                     // List all "implementation" dependencies (for new Gradle) as "runtime" dependencies