jlengrand · jlengrand · May 23, 2024 · May 22, 2024 · May 22, 2024 · May 22, 2024
diff --git a/.gradle/6.3/executionHistory/executionHistory.bin b/.gradle/6.3/executionHistory/executionHistory.bin
diff --git a/.gradle/6.3/executionHistory/executionHistory.lock b/.gradle/6.3/executionHistory/executionHistory.lock
diff --git a/.gradle/6.3/fileContent/fileContent.lock b/.gradle/6.3/fileContent/fileContent.lock
diff --git a/.gradle/6.3/fileHashes/fileHashes.bin b/.gradle/6.3/fileHashes/fileHashes.bin
diff --git a/.gradle/6.3/fileHashes/fileHashes.lock b/.gradle/6.3/fileHashes/fileHashes.lock
diff --git a/.gradle/6.5.1/fileHashes/fileHashes.lock b/.gradle/6.5.1/fileHashes/fileHashes.lock
diff --git a/.gradle/6.5/executionHistory/executionHistory.bin b/.gradle/6.5/executionHistory/executionHistory.bin
diff --git a/.gradle/6.5/executionHistory/executionHistory.lock b/.gradle/6.5/executionHistory/executionHistory.lock
diff --git a/.gradle/6.5/fileChanges/last-build.bin b/.gradle/6.5/fileChanges/last-build.bin
diff --git a/.gradle/6.5/fileContent/fileContent.lock b/.gradle/6.5/fileContent/fileContent.lock
diff --git a/.gradle/6.5/fileHashes/fileHashes.lock b/.gradle/6.5/fileHashes/fileHashes.lock
diff --git a/.gradle/7.6/checksums/checksums.lock b/.gradle/7.6/checksums/checksums.lock
diff --git a/.gradle/7.6/checksums/md5-checksums.bin b/.gradle/7.6/checksums/md5-checksums.bin
diff --git a/.gradle/7.6/checksums/sha1-checksums.bin b/.gradle/7.6/checksums/sha1-checksums.bin
diff --git a/.gradle/7.6/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.6/dependencies-accessors/dependencies-accessors.lock
diff --git a/.gradle/6.3/gc.properties → .../7.6/dependencies-accessors/gc.properties b/.gradle/6.3/gc.properties → .../7.6/dependencies-accessors/gc.properties
diff --git a/.gradle/7.6/executionHistory/executionHistory.bin b/.gradle/7.6/executionHistory/executionHistory.bin
diff --git a/.gradle/7.6/executionHistory/executionHistory.lock b/.gradle/7.6/executionHistory/executionHistory.lock
diff --git a/.gradle/6.3/fileChanges/last-build.bin → .gradle/7.6/fileChanges/last-build.bin b/.gradle/6.3/fileChanges/last-build.bin → .gradle/7.6/fileChanges/last-build.bin
diff --git a/.gradle/7.6/fileHashes/fileHashes.bin b/.gradle/7.6/fileHashes/fileHashes.bin
diff --git a/.gradle/7.6/fileHashes/fileHashes.lock b/.gradle/7.6/fileHashes/fileHashes.lock
diff --git a/.gradle/6.5/fileHashes/fileHashes.bin → ...le/7.6/fileHashes/resourceHashesCache.bin b/.gradle/6.5/fileHashes/fileHashes.bin → ...le/7.6/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/6.5.1/gc.properties → .gradle/7.6/gc.properties b/.gradle/6.5.1/gc.properties → .gradle/7.6/gc.properties
diff --git a/.gradle/8.7/checksums/checksums.lock b/.gradle/8.7/checksums/checksums.lock
diff --git a/.gradle/8.7/checksums/md5-checksums.bin b/.gradle/8.7/checksums/md5-checksums.bin
diff --git a/.gradle/8.7/checksums/sha1-checksums.bin b/.gradle/8.7/checksums/sha1-checksums.bin
diff --git a/.gradle/6.5/gc.properties → .../8.7/dependencies-accessors/gc.properties b/.gradle/6.5/gc.properties → .../8.7/dependencies-accessors/gc.properties
diff --git a/.gradle/8.7/executionHistory/executionHistory.bin b/.gradle/8.7/executionHistory/executionHistory.bin
diff --git a/.gradle/8.7/executionHistory/executionHistory.lock b/.gradle/8.7/executionHistory/executionHistory.lock
diff --git a/.gradle/8.7/expanded/expanded.lock b/.gradle/8.7/expanded/expanded.lock
diff --git a/.gradle/6.5.1/fileChanges/last-build.bin → .gradle/8.7/fileChanges/last-build.bin b/.gradle/6.5.1/fileChanges/last-build.bin → .gradle/8.7/fileChanges/last-build.bin
diff --git a/.gradle/8.7/fileHashes/fileHashes.bin b/.gradle/8.7/fileHashes/fileHashes.bin
diff --git a/.gradle/8.7/fileHashes/fileHashes.lock b/.gradle/8.7/fileHashes/fileHashes.lock
diff --git a/.gradle/8.7/fileHashes/resourceHashesCache.bin b/.gradle/8.7/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/8.7/gc.properties b/.gradle/8.7/gc.properties
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties
@@ -1,2 +1,2 @@
-#Thu Oct 22 22:37:52 CEST 2020
-gradle.version=6.3
+#Wed May 22 23:29:19 CEST 2024
+gradle.version=8.7
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock
diff --git a/.gradle/checksums/md5-checksums.bin b/.gradle/checksums/md5-checksums.bin
diff --git a/.gradle/checksums/sha1-checksums.bin b/.gradle/checksums/sha1-checksums.bin
diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe
diff --git a/build.gradle b/build.gradle
@@ -1,57 +1,59 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id 'java'
-    id 'org.jetbrains.kotlin.jvm' version '1.4.10'
-    id 'org.jetbrains.kotlin.plugin.serialization' version '1.4.10'
+    id 'org.jetbrains.kotlin.jvm' version '2.0.0'
+    id 'org.jetbrains.kotlin.plugin.serialization' version '2.0.0'
 }
 
-apply plugin: 'kotlin-kapt' // required
-
+//apply plugin: 'kotlin-kapt'
 
 group 'nl.lengrand'
 version '1.0-SNAPSHOT'
 
 repositories {
     mavenCentral()
-    jcenter()
 }
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib"
 
-    implementation 'info.picocli:picocli:4.5.2'
-    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.0'
+    implementation 'info.picocli:picocli:4.7.6'
+    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3'
 
-    implementation 'com.github.kittinunf.fuel:fuel:2.3.0'
-    implementation 'com.github.kittinunf.fuel:fuel-kotlinx-serialization:2.3.0'
+    implementation 'com.github.kittinunf.fuel:fuel:2.3.1'
+    implementation 'com.github.kittinunf.fuel:fuel-kotlinx-serialization:2.3.1'
 
-    testImplementation "org.junit.jupiter:junit-jupiter-api:5.7.0"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.7.0"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.2"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.2"
 
-    kapt 'info.picocli:picocli-codegen:4.5.0'
+//    kapt 'info.picocli:picocli-codegen:4.7.6'
 }
 
 test {
     useJUnitPlatform()
 }
 
 compileKotlin {
-    kotlinOptions.jvmTarget = "11"
+    kotlin.compilerOptions.jvmTarget = JvmTarget.JVM_21
 }
 compileTestKotlin {
-    kotlinOptions.jvmTarget = "11"
+    kotlin.compilerOptions.jvmTarget = JvmTarget.JVM_21
 }
 
-kapt {
-    arguments {
-        arg("project", "${project.group}/${project.name}")
-    }
-}
+//kapt {
+//    arguments {
+//        arg("project", "${project.group}/${project.name}")
+//    }
+//}
+
+tasks.register('customFatJar', Jar) {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 
-task customFatJar(type: Jar) {
     manifest {
         attributes 'Main-Class': 'nl.lengrand.swacli.SwaCLIPaginate'
     }
-    baseName = 'all-in-one-jar'
+    archiveBaseName = 'all-in-one-jar'
     from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
     with jar
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists