Update development deps and remove year from copyright header (#13)

curioswitch · Apr 26, 2023 · 9de2628 · 9de2628
1 parent 243d37e
commit 9de2628
Show file tree

Hide file tree

Showing 33 changed files with 51 additions and 43 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019-2022 Choko (choko@curioswitch.org)
+Copyright (c) Choko (choko@curioswitch.org)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -46,9 +46,7 @@ dependencies {
 }
 
 protobuf {
-  protoc {
-    artifact.set("com.google.protobuf:protoc:3.22.3")
-  }
+  protoc { artifact.set("com.google.protobuf:protoc:3.22.3") }
 
   descriptorSetOptions.enabled.set(false)
   descriptorSetOptions.path.set(file("build/unused-descriptor-set"))
@@ -60,7 +58,9 @@ tasks {
       release.set(8)
 
       errorprone {
-        excludedPaths.set(".*com.google.protobuf.util.*|.*org.curioswitch.common.protobuf.json.test.*")
+        excludedPaths.set(
+          ".*com.google.protobuf.util.*|.*org.curioswitch.common.protobuf.json.test.*",
+        )
       }
 
       // protoc generates code deprecated code so disable the lint.
@@ -108,4 +108,4 @@ publishing {
       }
     }
   }
-}
+}
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -12,12 +12,12 @@ repositories {
 
 dependencies {
   // When updating, update above in plugins too
-  implementation("com.diffplug.spotless:spotless-plugin-gradle:6.1.0")
-  implementation("com.netflix.nebula:nebula-release-plugin:16.0.0")
-  implementation("io.github.gradle-nexus:publish-plugin:1.1.0")
-  implementation("me.champeau.jmh:jmh-gradle-plugin:0.6.6")
-  implementation("net.ltgt.gradle:gradle-errorprone-plugin:2.0.2")
-  implementation("net.ltgt.gradle:gradle-nullaway-plugin:1.2.0")
+  implementation("com.diffplug.spotless:spotless-plugin-gradle:6.18.0")
+  implementation("com.netflix.nebula:nebula-release-plugin:17.2.1")
+  implementation("io.github.gradle-nexus:publish-plugin:1.3.0")
+  implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.1")
+  implementation("net.ltgt.gradle:gradle-errorprone-plugin:3.1.0")
+  implementation("net.ltgt.gradle:gradle-nullaway-plugin:1.5.0")
 }
 
 spotless {

diff --git a/buildSrc/src/main/kotlin/org.curioswitch.curiostack.errorprone.gradle.kts b/buildSrc/src/main/kotlin/org.curioswitch.curiostack.errorprone.gradle.kts
@@ -27,6 +27,14 @@ tasks {
         disable("ImmutableMemberCollection")
 
         disable("Var")
+        disable("Varifier")
+
+        // TODO(chokoswitch): Consider suppressing only for the fields where avoiding
+        // standard casing is more readable.
+        disable("MemberName")
+
+        // TODO(chokoswitch): Consider enabling
+        disable("CanIgnoreReturnValueSuggester")
       }
 
       errorprone.nullaway {

diff --git a/buildSrc/src/main/kotlin/org.curioswitch.curiostack.spotless.gradle.kts b/buildSrc/src/main/kotlin/org.curioswitch.curiostack.spotless.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 val javaLicense =
   """
     /*
-     * Copyright (c) ${'$'}YEAR Choko (choko@curioswitch.org)
+     * Copyright (c) Choko (choko@curioswitch.org)
      * SPDX-License-Identifier: MIT
      */
 

diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -17,17 +17,17 @@ val DEPENDENCY_BOMS = listOf(
 val DEPENDENCY_SETS = listOf(
   DependencySet(
     "com.google.errorprone",
-    "2.10.0",
+    "2.18.0",
     listOf("error_prone_annotations", "error_prone_core")
   )
 )
 
 val DEPENDENCIES = listOf(
   "com.google.code.findbugs:annotations:3.0.1u2",
   "com.google.code.findbugs:jsr305:3.0.2",
-  "com.uber.nullaway:nullaway:0.9.4",
+  "com.uber.nullaway:nullaway:0.10.10",
   "net.bytebuddy:byte-buddy:1.14.4",
-  "org.assertj:assertj-core:3.22.0",
+  "org.assertj:assertj-core:3.24.2",
 )
 
 javaPlatform {

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -12,4 +12,4 @@ dependencyResolutionManagement {
   }
 }
 
-include(":dependencyManagement")
+include(":dependencyManagement")
diff --git a/src/main/java/org/curioswitch/common/protobuf/json/CodeGenUtil.java b/src/main/java/org/curioswitch/common/protobuf/json/CodeGenUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Choko (choko@curioswitch.org)
+ * Copyright (c) Choko (choko@curioswitch.org)
  * SPDX-License-Identifier: MIT
  */
 

diff --git a/src/main/java/org/curioswitch/common/protobuf/json/DoParse.java b/src/main/java/org/curioswitch/common/protobuf/json/DoParse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Choko (choko@curioswitch.org)
+ * Copyright (c) Choko (choko@curioswitch.org)
  * SPDX-License-Identifier: MIT
  */
 

diff --git a/src/main/java/org/curioswitch/common/protobuf/json/DoWrite.java b/src/main/java/org/curioswitch/common/protobuf/json/DoWrite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Choko (choko@curioswitch.org)
+ * Copyright (c) Choko (choko@curioswitch.org)
  * SPDX-License-Identifier: MIT
  */
 

diff --git a/src/main/java/org/curioswitch/common/protobuf/json/LocalVariables.java b/src/main/java/org/curioswitch/common/protobuf/json/LocalVariables.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Choko (choko@curioswitch.org)
+ * Copyright (c) Choko (choko@curioswitch.org)
  * SPDX-License-Identifier: MIT
  */
 

diff --git a/src/main/java/org/curioswitch/common/protobuf/json/MarshallerRegistry.java b/src/main/java/org/curioswitch/common/protobuf/json/MarshallerRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Choko (choko@curioswitch.org)
+ * Copyright (c) Choko (choko@curioswitch.org)
  * SPDX-License-Identifier: MIT
  */
 

diff --git a/src/main/java/org/curioswitch/common/protobuf/json/MessageMarshaller.java b/src/main/java/org/curioswitch/common/protobuf/json/MessageMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Choko (choko@curioswitch.org)
+ * Copyright (c) Choko (choko@curioswitch.org)
  * SPDX-License-Identifier: MIT
  */
 

diff --git a/src/main/java/org/curioswitch/common/protobuf/json/ParseSupport.java b/src/main/java/org/curioswitch/common/protobuf/json/ParseSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Choko (choko@curioswitch.org)
+ * Copyright (c) Choko (choko@curioswitch.org)
  * SPDX-License-Identifier: MIT
  */
 

diff --git a/src/main/java/org/curioswitch/common/protobuf/json/ProtoFieldInfo.java b/src/main/java/org/curioswitch/common/protobuf/json/ProtoFieldInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Choko (choko@curioswitch.org)
+ * Copyright (c) Choko (choko@curioswitch.org)
  * SPDX-License-Identifier: MIT
  */
 

diff --git a/src/main/java/org/curioswitch/common/protobuf/json/ProtobufUtil.java b/src/main/java/org/curioswitch/common/protobuf/json/ProtobufUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Choko (choko@curioswitch.org)
+ * Copyright (c) Choko (choko@curioswitch.org)
  * SPDX-License-Identifier: MIT
  */
 

diff --git a/src/main/java/org/curioswitch/common/protobuf/json/SerializeSupport.java b/src/main/java/org/curioswitch/common/protobuf/json/SerializeSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Choko (choko@curioswitch.org)
+ * Copyright (c) Choko (choko@curioswitch.org)
  * SPDX-License-Identifier: MIT
  */
 

diff --git a/src/main/java/org/curioswitch/common/protobuf/json/SetSerializedFieldName.java b/src/main/java/org/curioswitch/common/protobuf/json/SetSerializedFieldName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Choko (choko@curioswitch.org)
+ * Copyright (c) Choko (choko@curioswitch.org)
  * SPDX-License-Identifier: MIT
  */
 

diff --git a/src/main/java/org/curioswitch/common/protobuf/json/TypeSpecificMarshaller.java b/src/main/java/org/curioswitch/common/protobuf/json/TypeSpecificMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Choko (choko@curioswitch.org)
+ * Copyright (c) Choko (choko@curioswitch.org)
  * SPDX-License-Identifier: MIT
  */
 

diff --git a/src/main/java/org/curioswitch/common/protobuf/json/WellKnownTypeMarshaller.java b/src/main/java/org/curioswitch/common/protobuf/json/WellKnownTypeMarshaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Choko (choko@curioswitch.org)
+ * Copyright (c) Choko (choko@curioswitch.org)
  * SPDX-License-Identifier: MIT
  */
 

diff --git a/src/main/java/org/curioswitch/common/protobuf/json/bytebuddy/Goto.java b/src/main/java/org/curioswitch/common/protobuf/json/bytebuddy/Goto.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Choko (choko@curioswitch.org)
+ * Copyright (c) Choko (choko@curioswitch.org)
  * SPDX-License-Identifier: MIT
  */
 

diff --git a/src/main/java/org/curioswitch/common/protobuf/json/bytebuddy/IfEqual.java b/src/main/java/org/curioswitch/common/protobuf/json/bytebuddy/IfEqual.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Choko (choko@curioswitch.org)
+ * Copyright (c) Choko (choko@curioswitch.org)
  * SPDX-License-Identifier: MIT
  */
 

diff --git a/src/main/java/org/curioswitch/common/protobuf/json/bytebuddy/IfFalse.java b/src/main/java/org/curioswitch/common/protobuf/json/bytebuddy/IfFalse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Choko (choko@curioswitch.org)
+ * Copyright (c) Choko (choko@curioswitch.org)
  * SPDX-License-Identifier: MIT
  */
 

diff --git a/src/main/java/org/curioswitch/common/protobuf/json/bytebuddy/IfIntsNotEqual.java b/src/main/java/org/curioswitch/common/protobuf/json/bytebuddy/IfIntsNotEqual.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Choko (choko@curioswitch.org)
+ * Copyright (c) Choko (choko@curioswitch.org)
  * SPDX-License-Identifier: MIT
  */
 

diff --git a/src/main/java/org/curioswitch/common/protobuf/json/bytebuddy/IfNotNull.java b/src/main/java/org/curioswitch/common/protobuf/json/bytebuddy/IfNotNull.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Choko (choko@curioswitch.org)
+ * Copyright (c) Choko (choko@curioswitch.org)
  * SPDX-License-Identifier: MIT
  */
 

diff --git a/src/main/java/org/curioswitch/common/protobuf/json/bytebuddy/IfRefsEqual.java b/src/main/java/org/curioswitch/common/protobuf/json/bytebuddy/IfRefsEqual.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Choko (choko@curioswitch.org)
+ * Copyright (c) Choko (choko@curioswitch.org)
  * SPDX-License-Identifier: MIT
  */
 

diff --git a/src/main/java/org/curioswitch/common/protobuf/json/bytebuddy/IfRefsNotEqual.java b/src/main/java/org/curioswitch/common/protobuf/json/bytebuddy/IfRefsNotEqual.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Choko (choko@curioswitch.org)
+ * Copyright (c) Choko (choko@curioswitch.org)
  * SPDX-License-Identifier: MIT
  */
 

diff --git a/src/main/java/org/curioswitch/common/protobuf/json/bytebuddy/IfTrue.java b/src/main/java/org/curioswitch/common/protobuf/json/bytebuddy/IfTrue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Choko (choko@curioswitch.org)
+ * Copyright (c) Choko (choko@curioswitch.org)
  * SPDX-License-Identifier: MIT
  */
 

diff --git a/src/main/java/org/curioswitch/common/protobuf/json/bytebuddy/SetJumpTargetLabel.java b/src/main/java/org/curioswitch/common/protobuf/json/bytebuddy/SetJumpTargetLabel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Choko (choko@curioswitch.org)
+ * Copyright (c) Choko (choko@curioswitch.org)
  * SPDX-License-Identifier: MIT
  */
 

diff --git a/src/test/java/org/curioswitch/common/protobuf/json/GithubApiTest.java b/src/test/java/org/curioswitch/common/protobuf/json/GithubApiTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Choko (choko@curioswitch.org)
+ * Copyright (c) Choko (choko@curioswitch.org)
  * SPDX-License-Identifier: MIT
  */
 

diff --git a/src/test/java/org/curioswitch/common/protobuf/json/JsonTestUtil.java b/src/test/java/org/curioswitch/common/protobuf/json/JsonTestUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Choko (choko@curioswitch.org)
+ * Copyright (c) Choko (choko@curioswitch.org)
  * SPDX-License-Identifier: MIT
  */
 

diff --git a/src/test/java/org/curioswitch/common/protobuf/json/MessageMarshallerTest.java b/src/test/java/org/curioswitch/common/protobuf/json/MessageMarshallerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022 Choko (choko@curioswitch.org)
+ * Copyright (c) Choko (choko@curioswitch.org)
  * SPDX-License-Identifier: MIT
  */
 

diff --git a/src/test/java/org/curioswitch/common/protobuf/json/ProtobufUtilTest.java b/src/test/java/org/curioswitch/common/protobuf/json/ProtobufUtilTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Choko (choko@curioswitch.org)
+ * Copyright (c) Choko (choko@curioswitch.org)
  * SPDX-License-Identifier: MIT
  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,4 +12,4 @@ dependencyResolutionManagement { @@
       }
     }
-    include(":dependencyManagement")
+    include(":dependencyManagement")