Build with Java 17

open-jumpco · Mar 7, 2024 · 4f30d67 · 4f30d67
1 parent bfab116
commit 4f30d67
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 22 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -42,9 +42,9 @@ jobs:
       - name: Set up JDK 11 for ${{ steps.parameters.outputs.arch }}
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'zulu'
-#          architecture: ${{ steps.parameters.outputs.arch }}
+          cache: gradle
       - name: 'Build'
         shell: bash
         run: |

diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/build.gradle b/build.gradle
@@ -48,8 +48,8 @@ dependencies {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 apply plugin: 'kotlinx-atomicfu'
@@ -143,21 +143,29 @@ tasks.withType(KotlinTest).configureEach {
 }
 
 def rootDir = rootProject.projectDir.path
-dokkaHtml {
-    onlyIf { (hasProperty('dokka') ?: 'false').asBoolean() }
-    dokkaSourceSets {
-        configureEach {
-            samples.from(
-                "$rootDir/src/commonTest/kotlin/io/jumpco/open/kfsm/example/TurnstileTypes.kt",
-                "$rootDir/src/commonTest/kotlin/io/jumpco/open/kfsm/example/ImmutableLockFSM.kt",
-                "$rootDir/src/commonTest/kotlin/io/jumpco/open/kfsm/example/LockTypes.kt",
-                "$rootDir/src/commonTest/kotlin/io/jumpco/open/kfsm/example/PayingTurnstileTypes.kt",
-                "$rootDir/src/commonTest/kotlin/io/jumpco/open/kfsm/example/SecureTurnstile.kt"
-            )
+
+if('true' == project.findProperty('dokka')) {
+    logger.lifecycle("dokkaHtml")
+    dokkaHtml {
+        dokkaSourceSets {
+            configureEach {
+                samples.from(
+                    "$rootDir/src/commonTest/kotlin/io/jumpco/open/kfsm/example/TurnstileTypes.kt",
+                    "$rootDir/src/commonTest/kotlin/io/jumpco/open/kfsm/example/ImmutableLockFSM.kt",
+                    "$rootDir/src/commonTest/kotlin/io/jumpco/open/kfsm/example/LockTypes.kt",
+                    "$rootDir/src/commonTest/kotlin/io/jumpco/open/kfsm/example/PayingTurnstileTypes.kt",
+                    "$rootDir/src/commonTest/kotlin/io/jumpco/open/kfsm/example/SecureTurnstile.kt"
+                )
+            }
         }
+        inputs.dir('src/commonTest/kotlin')
     }
-    inputs.dir('src/commonTest/kotlin')
+} else {
+    dokkaHtml.onlyIf { false }
 }
+dokkaJavadoc.onlyIf { false }
+dokkaJekyll.onlyIf { false }
+dokkaGfm.onlyIf { false }
 
 tasks.register('copyPng', Copy) {
     from(projectDir) {
@@ -229,8 +237,3 @@ kfsmViz {
         output = 'packet-reader-detail'
     }
 }
-
-dokkaJavadoc.onlyIf { false }
-dokkaJekyll.onlyIf { false }
-dokkaGfm.onlyIf { false }
-