chore: bump flyway dependencies

Author: AndrewWestberg

.github/workflows/ktlint.yml

@@ -32,14 +32,14 @@ jobs:
           fi
           echo "SHA256 verification passed"
           
-          #Temporarily disable gpg checks due to keybase not returning the key
-          # Import ktlint PGP key and verify signature using official method
-#          curl -sS https://keybase.io/ktlint/pgp_keys.asc | gpg --import && gpg --verify ktlint.asc
-#          if [ $? -ne 0 ]; then
-#            echo "PGP signature verification failed!"
-#            exit 1
-#          fi
-#          echo "PGP signature verification passed"
+          # Import ktlint PGP key
+          gpg --keyserver keyserver.ubuntu.com --recv adbc987d1a7b91db6b0aaa81995efbf4a3d20beb
+          gpg --verify ktlint.asc
+          if [ $? -ne 0 ]; then
+            echo "PGP signature verification failed!"
+            exit 1
+          fi
+          echo "PGP signature verification passed"
           
           # Install ktlint
           chmod a+x ktlint

build.gradle.kts

@@ -1,5 +1,4 @@
 import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 buildscript {
@@ -65,10 +64,6 @@ subprojects {
         }
     }
 
-    tasks.withType<ShadowJar> {
-        isZip64 = true
-    }
-
     tasks.withType<Test> {
         useJUnitPlatform()
         maxHeapSize = "8192m"

buildSrc/src/main/kotlin/Versions.kt

@@ -13,7 +13,7 @@ object Versions {
     const val CLOUDINARY = "1.39.0"
     const val COROUTINES = "1.10.2"
     const val EXPOSED = "0.61.0"
-    const val FLYWAYDB = "11.12.0" // 11.13.1 has issues with our flyway ktor plugin
+    const val FLYWAYDB = "11.13.1"
     const val GOOGLE_TRUTH = "1.4.5"
     const val GRPC = "1.75.0"
     const val GRPC_KOTLIN = "1.5.0"
@@ -32,7 +32,7 @@ object Versions {
     const val KTLINT = "1.7.1"
     const val KTLINT_PLUGIN = "12.1.1"
     const val KTOR = "3.3.0"
-    const val KTOR_FLYWAY = "3.0.0"
+    const val KTOR_FLYWAY = "3.3.0"
     const val LOGBACK = "1.5.18"
     const val MAVEN_PUBLISH = "0.34.0"
     const val MOCKK = "1.14.5"

newm-chain/build.gradle.kts

@@ -1,3 +1,4 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import java.text.SimpleDateFormat
 import java.util.Date
 
@@ -96,13 +97,20 @@ dependencies {
     testImplementation(Dependencies.TestContainers.POSTGRESQL)
 }
 
-tasks {
-    shadowJar {
-        // defaults to project.name
-        // archiveBaseName.set("${project.name}-fat")
+tasks.withType<ShadowJar> {
+    isZip64 = true
+    // defaults to project.name
+    // archiveBaseName.set("${project.name}-fat")
 
-        // defaults to all, so removing this overrides the normal, non-fat jar
-        archiveClassifier.set("")
+    // defaults to "all", so removing this overrides the normal, non-fat jar
+    archiveClassifier.set("")
+
+    // ensure gRPC stuff gets merged together first
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    mergeServiceFiles()
+
+    filesNotMatching("META-INF/services/**") {
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     }
 }
 

newm-server/build.gradle.kts

@@ -1,3 +1,4 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import java.text.SimpleDateFormat
 import java.time.Instant
 import java.util.Date
@@ -153,22 +154,24 @@ tasks.withType<Jar> {
     }
 }
 
-tasks {
-    shadowJar {
-        isZip64 = true
-        // defaults to project.name
-        // archiveBaseName.set("${project.name}-fat")
+tasks.withType<ShadowJar> {
+    isZip64 = true
+    // defaults to project.name
+    // archiveBaseName.set("${project.name}-fat")
 
-        // defaults to "all", so removing this overrides the normal, non-fat jar
-        archiveClassifier.set("")
+    // defaults to "all", so removing this overrides the normal, non-fat jar
+    archiveClassifier.set("")
 
-        // ensure gRPC stuff gets merged in
-        duplicatesStrategy = DuplicatesStrategy.INCLUDE
-        mergeServiceFiles()
+    // ensure gRPC stuff gets merged together first
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    mergeServiceFiles()
 
-        dependsOn("distZip")
-        dependsOn("distTar")
+    filesNotMatching("META-INF/services/**") {
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     }
+
+    dependsOn("distZip")
+    dependsOn("distTar")
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {