Upgrade Kotlin to 1.8.22

Upgrade ksp to 1.8.22-1.0.11

Upgrade detekt to 1.23

Edit detekt.yml for new rules

Upgrade log4j to 2.20.0

Upgrade auto-service-annotations to 1.1.1

Upgrade auto-service-ksp to 1.1.0

Upgrade commons-io to 2.13.0

Upgrade truth to 1.1.5

Upgrade jimfs to 1.3.0

Author: mbayerPK

build.gradle.kts

@@ -1,10 +1,11 @@
 import io.gitlab.arturbosch.detekt.Detekt
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     alias(libs.plugins.ktlint) apply false
     alias(libs.plugins.detekt)
-    kotlin("jvm") version "1.7.21" apply false
+    kotlin("jvm") version "1.8.22" apply false
 }
 
 subprojects {
@@ -13,18 +14,19 @@ subprojects {
 
     group = "com.pkware.filesystem"
 
-    val kotlinJvmTarget = "1.8"
-
     repositories {
         mavenCentral()
     }
 
-    tasks.withType<KotlinCompile> {
-        kotlinOptions {
-            jvmTarget = kotlinJvmTarget
-            freeCompilerArgs = listOf(
+    tasks.withType<KotlinCompile>().configureEach {
+        compilerOptions {
+
+            jvmTarget.set(JvmTarget.JVM_1_8)
+
+            freeCompilerArgs.addAll(
                 "-Xjvm-default=all",
-                "-Xopt-in=kotlin.RequiresOptIn",
+                "-Xinline-classes",
+                "-opt-in=kotlin.contracts.ExperimentalContracts",
                 "-Xjsr305=strict",
 
                 // Ensure assertions don't add performance cost. See https://youtrack.jetbrains.com/issue/KT-22292
@@ -33,10 +35,14 @@ subprojects {
         }
     }
 
+    dependencies {
+        detektPlugins(project.dependencies.create("com.pkware.detekt:import-extension:1.1.0"))
+    }
+
     tasks.withType<Test> { useJUnitPlatform() }
 
     tasks.withType<Detekt>().configureEach {
-        jvmTarget = kotlinJvmTarget
+        jvmTarget = tasks.named<KotlinCompile>("compileKotlin").get().compilerOptions.jvmTarget.get().target
         parallel = true
         config.from(rootProject.file("detekt.yml"))
         buildUponDefaultConfig = true

detekt.yml

@@ -4,6 +4,14 @@ config:
   validation: true
   warningsAsErrors: true
 
+import:
+  EnforceStaticImport:
+    active: true
+    methods:
+      - 'com.google.common.truth.Truth.assertThat'
+      - 'org.junit.jupiter.params.provider.Arguments.arguments'
+      - 'org.apache.logging.log4j.spi.AbstractLogger.CATCHING_MARKER'
+
 comments:
   active: true
   EndOfSentenceFormat:
@@ -18,11 +26,11 @@ comments:
     searchInInnerObject: true
     searchInInnerInterface: true
   UndocumentedPublicFunction:
-    excludes: ['**/test/**']
     active: true
-  UndocumentedPublicProperty:
     excludes: ['**/test/**']
+  UndocumentedPublicProperty:
     active: true
+    excludes: ['**/test/**']
 
 complexity:
   active: false
@@ -38,14 +46,14 @@ exceptions:
   TooGenericExceptionCaught:
     active: true
     exceptionNames:
-     - ArrayIndexOutOfBoundsException
-     - Error
-     - Exception
-     - IllegalMonitorStateException
-     - NullPointerException
-     - IndexOutOfBoundsException
-     - RuntimeException
-     - Throwable
+      - ArrayIndexOutOfBoundsException
+      - Error
+      - Exception
+      - IllegalMonitorStateException
+      - NullPointerException
+      - IndexOutOfBoundsException
+      - RuntimeException
+      - Throwable
     allowedExceptionNameRegex: '_|(ignore|expected|cause).*'
 
 # The naming rules exclude test classes by default. Since we want naming rules to apply
@@ -76,25 +84,33 @@ potential-bugs:
     active: true
   DontDowncastCollectionTypes:
     active: true
-  ExitOutsideMain:
+  DoubleMutabilityForCollection:
     active: true
-  HasPlatformType:
+    # Test directories might want to reassign variables for result collections
+    excludes: [ '**/test/**' ]
+  ElseCaseInsteadOfExhaustiveWhen:
+    active: true
+  ExitOutsideMain:
     active: true
   IgnoredReturnValue:
     active: true
-    restrictToAnnotatedMethods: true
+    restrictToConfig: true
     returnValueAnnotations: ['*.CheckReturnValue', '*.CheckResult']
   MapGetWithNotNullAssertionOperator:
     active: true
+    # test directories will want to throw NPE's with maps
+    excludes: [ '**/test/**' ]
   NullableToStringCall:
     active: true
-  UnconditionalJumpStatementInLoop:
+    ignoreFunction:
+      - 'toString()'
+  NullCheckOnMutableProperty:
     active: true
-  UnreachableCatchBlock:
+  PropertyUsedBeforeDeclaration:
     active: true
-  UnusedUnaryOperator:
+  UnconditionalJumpStatementInLoop:
     active: true
-  UselessPostfixExpression:
+  UnnecessaryNotNullCheck:
     active: true
 
 style:
@@ -105,14 +121,20 @@ style:
     active: true
   DataClassShouldBeImmutable:
     active: true
+  DestructuringDeclarationWithTooManyEntries:
+    active: true
+    maxDestructuringEntries: 4
+  DoubleNegativeLambda:
+    active: true
   EqualsOnSignatureLine:
     active: true
   ExplicitCollectionElementAccessMethod:
     active: true
   ExpressionBodySyntax:
     active: true
     includeLineWrapping: true
-    excludes: ['**/test/**']
+  ForbiddenAnnotation:
+    active: true
   ForbiddenImport:
     active: true
     imports:
@@ -122,32 +144,49 @@ style:
       - 'org.junit.BeforeClass'
       - 'org.junit.After'
       - 'org.junit.AfterClass'
-    forbiddenPatterns: 'junit.framework.*'
+      - 'org.junit.jupiter.api.Assertions'
+    forbiddenPatterns: '(?:junit\.framework|org\.junit\.jupiter\.api\.Assertions)\.(?!assertThrows).+'
   ForbiddenComment:
-    active: true
-    values: ['FIXME', 'STOPSHIP']
+    comments:
+      - reason: 'Forbidden FIXME todo marker in comment, please fix the problem.'
+        value: 'FIXME'
+      - reason: 'Forbidden STOPSHIP todo marker in comment, please address the problem before shipping the code.'
+        value: 'STOPSHIP'
+      - reason: 'Authors are not recorded in KDoc.'
+        value: '@author'
   ForbiddenMethodCall:
     active: true
-    excludes: ['**/test/**']
+    excludes: [ '**/test/**' ]
     methods:
       - 'kotlin.io.println'
       - 'kotlin.io.print'
-  ForbiddenPublicDataClass:
-    active: true
-    excludes: ['**']
-    ignorePackages: ['*.internal', '*.internal.*']
+      - 'java.nio.file.Path.toFile'
+      - 'org.apache.logging.log4j.Logger.trace'
+      - 'org.apache.logging.log4j.Logger.debug'
+      - 'org.apache.logging.log4j.Logger.info'
+      - 'org.apache.logging.log4j.Logger.warn'
+      - 'org.apache.logging.log4j.Logger.error'
+      - 'org.apache.logging.log4j.Logger.fatal'
+      - 'org.apache.logging.log4j.Logger.log'
+      - 'org.apache.logging.log4j.Logger.printf'
+      - 'org.apache.logging.log4j.Logger.isTraceEnabled'
+      - 'org.apache.logging.log4j.Logger.isDebugEnabled'
+      - 'org.apache.logging.log4j.Logger.isInfoEnabled'
+      - 'org.apache.logging.log4j.Logger.isWarnEnabled'
+      - 'org.apache.logging.log4j.Logger.isErrorEnabled'
+      - 'org.apache.logging.log4j.Logger.isFatalEnabled'
+      - 'org.apache.logging.log4j.Logger.isEnabled'
   ForbiddenVoid:
     active: true
     ignoreOverridden: false
     ignoreUsageInGenerics: false
-  LibraryCodeMustSpecifyReturnType:
-    # Enforced by the compiler
-    active: false
-  LibraryEntitiesShouldNotBePublic:
-    # Enforced by the compiler
-    active: false
-  MandatoryBracesIfStatements:
+  LoopWithTooManyJumpStatements:
+    maxJumpCount: 3
+  BracesOnIfStatements:
     active: true
+  BracesOnWhenStatements:
+    active: true
+    multiLine: 'necessary'
   MandatoryBracesLoops:
     active: true
   MaxLineLength:
@@ -156,14 +195,11 @@ style:
   NewLineAtEndOfFile:
     # Specified by editorconfig & enforced by ktlint
     active: false
-  OptionalWhenBraces:
+  NullableBooleanCheck:
     active: true
   RedundantExplicitType:
     active: true
-  RedundantHigherOrderMapUsage:
-    active: true
   RedundantVisibilityModifierRule:
-    # activate to true once https://github.com/detekt/detekt/issues/3874 is resolved
     active: false
   ReturnCount:
     active: false
@@ -172,38 +208,37 @@ style:
   UnderscoresInNumericLiterals:
     active: true
     acceptableLength: 5
-  UnnecessaryFilter:
+  UnnecessaryBackticks:
     active: true
+  # Disabled because it produces false positive when using JUnit's @Nested classes
+  UnnecessaryInnerClass:
+    active: false
   UnnecessaryLet:
     active: true
   UntilInsteadOfRangeTo:
     active: true
-  UnusedPrivateMember:
-    active: true
-    excludes: ['**/test/**']
-  UseArrayLiteralsInAnnotations:
-    active: true
-  UseCheckNotNull:
-    active: true
-  UseCheckOrError:
-    active: true
   UseEmptyCounterpart:
     active: true
   UseIfEmptyOrIfBlank:
     active: true
   UseIfInsteadOfWhen:
     active: true
-  UseIsNullOrEmpty:
+    ignoreWhenContainingVariableDeclaration: true
+  UseLet:
     active: true
-  UseOrEmpty:
+  UseRequireNotNull:
     active: true
-  UseRequire:
+  UseSumOfInsteadOfFlatMapSize:
     active: true
-  UseRequireNotNull:
+  UnnecessaryBracesAroundTrailingLambda:
     active: true
   WildcardImport:
     # Specified by editorconfig and enforced by ktlint
     active: false
   MagicNumber:
     # We usually catch these in code review, and more often than not, the constants aren't very magical
     active: false
+
+performance:
+  UnnecessaryPartOfBinaryExpression:
+    active: true

file-attribute-caching/src/test/kotlin/com/pkware/filesystem/attributecaching/AttributeCachingFileSystemTests.kt

@@ -50,16 +50,15 @@ class AttributeCachingFileSystemTests {
         val waitTimeMillis: Long = 50_000
         var caughtException: Exception? = null
 
-        fun runTestThread(): Thread {
-            return thread {
-                for (i in 1..100_000) {
-                    try {
-                        AttributeCachingFileSystem.wrapping(defaultFileSystem).use { }
-                    } catch (e: Exception) {
-                        // Need to catch and record the exception here because junit does not fail the test if an
-                        // assertion fails inside a thread.
-                        caughtException = e
-                    }
+        fun runTestThread(): Thread = thread {
+            @Suppress("UnusedPrivateProperty")
+            for (i in 1..100_000) {
+                try {
+                    AttributeCachingFileSystem.wrapping(defaultFileSystem).use { }
+                } catch (e: Exception) {
+                    // Need to catch and record the exception here because junit does not fail the test if an
+                    // assertion fails inside a thread.
+                    caughtException = e
                 }
             }
         }

gradle/libs.versions.toml

@@ -1,22 +1,22 @@
 [versions]
-junitVersion = "5.8.2"
-detektVersion = "1.20.0"
-log4jVersion = "2.18.0"
+detektVersion = "1.23.1"
+junitVersion = "5.10.0"
 ktlintVersion = "11.5.0"
+log4jVersion = "2.20.0"
 
 [libraries]
-commons-io = "commons-io:commons-io:2.11.0"
-auto-service-annotations = "com.google.auto.service:auto-service-annotations:1.0.1"
-auto-service-ksp = "dev.zacsweers.autoservice:auto-service-ksp:1.0.0"
+commons-io = "commons-io:commons-io:2.13.0"
+auto-service-annotations = "com.google.auto.service:auto-service-annotations:1.1.1"
+auto-service-ksp = "dev.zacsweers.autoservice:auto-service-ksp:1.1.0"
 junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junitVersion" }
 junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junitVersion" }
-truth = "com.google.truth:truth:1.1.3"
+truth = "com.google.truth:truth:1.1.5"
 mockito-kotlin = "org.mockito.kotlin:mockito-kotlin:4.1.0"
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4jVersion" }
 log4j-api = { module = "org.apache.logging.log4j:log4j-api", version.ref = "log4jVersion" }
-jimfs = "com.google.jimfs:jimfs:1.2"
+jimfs = "com.google.jimfs:jimfs:1.3.0"
 
 [plugins]
-ksp = "com.google.devtools.ksp: 1.7.21-1.0.8"
+ksp = "com.google.devtools.ksp: 1.8.22-1.0.11"
 ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlintVersion" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detektVersion" }