JAVA-8350 - Gradle build integration with maven Merge pull request #972 from yadavan88/maven-gradle-build-backup

Author: anastasiosioannidis

.github/dependabot.yml

@@ -1,25 +1,25 @@
-version: 1
+version: 2
 updates:
   - package-ecosystem: "maven"
     directory: /
     schedule:
       interval: daily
     ignore:
-      - dependency_name: "com.google.code.gson:gson"
+      - dependency-name: "com.google.code.gson:gson"
         versions: ["2.8.5"]
-      - dependency_name: "com.google.protobuf:protobuf-java"
+      - dependency-name: "com.google.protobuf:protobuf-java"
         versions: ["3.18.1"]
-      - dependency_name: "com.google.protobuf:protobuf-kotlin"
+      - dependency-name: "com.google.protobuf:protobuf-kotlin"
         versions: ["3.18.1"]
-      - dependency_name: "ch.qos.logback:logback-core"
+      - dependency-name: "ch.qos.logback:logback-core"
         versions: ["1.1.7", "1.2.3"]
-      - dependency_name: "org.jboss.resteasy:resteasy-client"
+      - dependency-name: "org.jboss.resteasy:resteasy-client"
         versions: ["3.8.0.Final"]
-      - dependency_name: "ch.qos.logback:logback-classic"
+      - dependency-name: "ch.qos.logback:logback-classic"
         versions: ["1.2.3"]
-      - dependency_name: "com.fasterxml.jackson.core:jackson-databind"
+      - dependency-name: "com.fasterxml.jackson.core:jackson-databind"
         versions: ["2.11.1"]
-      - dependency_name: "com.h2database:h2"
+      - dependency-name: "com.h2database:h2"
         versions: ["2.1.210"]
-      - dependency_name: "com.google.guava:guava"
-        versions: ["29.0-jre"]
+      - dependency-name: "com.google.guava:guava"
+        versions: ["29.0-jre"]

.gitignore

@@ -92,4 +92,5 @@ apache-fop/src/test/resources/output_herold.pdf
 apache-fop/src/test/resources/output_html2fo.pdf
 apache-fop/src/test/resources/output_jtidy.pdf
 
-!ktlint-custom-1.0.0-SNAPSHOT.jar
+!ktlint-custom-1.0.0-SNAPSHOT.jar
+!**/gradle-wrapper.jar

core-kotlin-companion/src/main/java/ConstSample.kt renamed to core-kotlin-companion/src/main/kotlin/ConstSample.kt

@@ -28,7 +28,7 @@
     </dependencies>
 
     <properties>
-        <kotlinx-html-jvm.version>0.7.2</kotlinx-html-jvm.version>
+        <kotlinx-html-jvm.version>0.7.5</kotlinx-html-jvm.version>
     </properties>
 
     <build>

core-kotlin-companion/src/main/java/FieldSample.kt renamed to core-kotlin-companion/src/main/kotlin/FieldSample.kt

@@ -1,7 +1,7 @@
 plugins {
     java
     application
-    kotlin("jvm") version "1.8.22"
+    kotlin("jvm") version "2.0.0"
 }
 
 sourceSets {

core-kotlin-companion/src/main/java/LateInitSample.kt renamed to core-kotlin-companion/src/main/kotlin/LateInitSample.kt

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists