Various maintenance and cleanup tasks

.github/workflows/main-build.yml

@@ -7,12 +7,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
+          distribution: 'zulu'
           java-version: 11
-      - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+          cache: 'gradle'
       - name: Deserialize signing certs
         run: |
           echo ${{ secrets.CERT_BASE64 }} | base64 --decode > cert.p7b

.github/workflows/pr-build.yml

@@ -1,16 +1,14 @@
-name: Run Gradle on PRs
+name: Build PRs
 on: pull_request
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
+          distribution: 'zulu'
           java-version: 11
-      - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
-        with:
-          cache-read-only: ${{ github.ref != 'refs/heads/main' }}
+          cache: 'gradle'
       - name: Build
         run: ./gradlew build

LICENSE.html

@@ -0,0 +1,15 @@
+<div>
+    <p>MIT License</p>
+    <p>Copyright (c) 2023 Ignition Module Development Community</p>
+    <p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+        documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+        the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
+        to permit persons to whom the Software is furnished to do so, subject to the following conditions: </p>
+    <p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of
+        the Software. </p>
+    <p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+        THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+        CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+        DEALINGS IN THE SOFTWARE.</p>
+</div>

build.gradle.kts

@@ -4,6 +4,13 @@ plugins {
     alias(libs.plugins.modl)
 }
 
+allprojects {
+    repositories {
+        mavenCentral()
+        maven(url = "https://nexus.inductiveautomation.com/repository/public")
+    }
+}
+
 subprojects {
     // cascade version, which will be set at command line in CI, down to subprojects
     version = rootProject.version
@@ -15,8 +22,8 @@ ignitionModule {
     id.set("org.imdc.extensions.IgnitionExtensions")
     moduleVersion.set("${project.version}")
     moduleDescription.set("Useful but niche extensions to Ignition for power users")
-    license.set("LICENSE.md")
-    requiredIgnitionVersion.set(libs.versions.ignition.get())
+    license.set("LICENSE.html")
+    requiredIgnitionVersion.set(libs.versions.ignition)
 
     projectScopes.putAll(
         mapOf(

client/build.gradle.kts

@@ -4,9 +4,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain {
-        languageVersion.set(libs.versions.java.map(JavaLanguageVersion::of))
-    }
+    jvmToolchain(libs.versions.java.map(String::toInt).get())
 }
 
 dependencies {

common/build.gradle.kts

@@ -4,9 +4,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain {
-        languageVersion.set(libs.versions.java.map(JavaLanguageVersion::of))
-    }
+    jvmToolchain(libs.versions.java.map(String::toInt).get())
 }
 
 dependencies {

designer/build.gradle.kts

@@ -4,9 +4,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain {
-        languageVersion.set(libs.versions.java.map(JavaLanguageVersion::of))
-    }
+    jvmToolchain(libs.versions.java.map(String::toInt).get())
 }
 
 dependencies {

docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   gateway:
-    image: inductiveautomation/ignition:8.1.20
+    image: inductiveautomation/ignition:8.1.24
     ports:
       - 18088:8088
       - 18000:8000

gateway/build.gradle.kts

@@ -4,9 +4,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain {
-        languageVersion.set(libs.versions.java.map(JavaLanguageVersion::of))
-    }
+    jvmToolchain(libs.versions.java.map(String::toInt).get())
 }
 
 dependencies {

gradle/libs.versions.toml

@@ -1,15 +1,13 @@
 [versions]
 java = "11"
-kotlin = "1.7.20"
-kotest = "5.4.1"
+kotlin = "1.8.0"
+kotest = "5.5.4"
 ignition = "8.1.0"
 
 [plugins]
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
-#serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 modl = { id = "io.ia.sdk.modl", version = "0.1.1" }
-ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "11.0.0" }
-dokka = { id = "org.jetbrains.dokka", version.ref = "kotlin" }
+ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "11.1.0" }
 
 [libraries]
 ignition-common = { group = "com.inductiveautomation.ignitionsdk", name = "ignition-common", version.ref = "ignition" }
@@ -23,7 +21,7 @@ kotest-junit = { group = "io.kotest", name = "kotest-runner-junit5", version.ref
 kotest-assertions-core = { group = "io.kotest", name = "kotest-assertions-core", version.ref = "kotest" }
 kotest-property = { group = "io.kotest", name = "kotest-property", version.ref = "kotest" }
 kotest-data = { group = "io.kotest", name = "kotest-framework-datatest", version.ref = "kotest" }
-mockk = { group = "io.mockk", name = "mockk", version = "1.13.1" }
+mockk = { group = "io.mockk", name = "mockk", version = "1.13.4" }
 
 [bundles]
 gateway = [

settings.gradle.kts

@@ -9,18 +9,9 @@ pluginManagement {
 
 rootProject.name = "ignition-extensions"
 
-dependencyResolutionManagement {
-    repositories {
-        // enable resolving dependencies from the inductive automation artifact repository
-        maven(url = "https://nexus.inductiveautomation.com/repository/public")
-        mavenCentral()
-    }
-}
-
 include(
-    ":",
-    ":common",
-    ":gateway",
-    ":designer",
-    ":client",
+    "common",
+    "gateway",
+    "designer",
+    "client",
 )