updating to java 17 and gradle 8.5

.gitattributes

@@ -1,3 +1,3 @@
 * text=auto eol=lf
-*.{cmd,[cC][mM][dD]} text eol=crlf
-*.{bat,[bB][aA][tT]} text eol=crlf
+*.bat eol=crlf
+*.cmd eol=crlf

.github/workflows/gradle.yml

@@ -14,10 +14,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
       - name: Build with Gradle
         run: make all

.github/workflows/release.yml

@@ -13,10 +13,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
       - name: Build with Gradle
         run: make all

.gitignore

@@ -9,8 +9,7 @@ test.txt
 build
 out
 .idea/
-gradle.properties
 .project
 .settings
 .classpath
-bin
+bin

.java-version

@@ -1 +1 @@
-13
+17

Makefile

@@ -1,19 +1,12 @@
 GIT_TAG := $(shell git describe --tags 2>/dev/null)
 
-.PHONY: all
-all: clean test build
-
-.PHONY: build
-build: clean
-	./gradlew --console plain -Pversion=${GIT_TAG} shadowJar
+ifeq "${GIT_TAG}" ""
+GIT_TAG := dev
+endif
 
-.PHONY: clean
-clean:
-	./gradlew --console plain clean
-
-.PHONY: test
-test:
-	./gradlew --console plain test -Dignore.integration.tests='true'
+.PHONY: all
+all:
+	./gradlew --console plain -Pversion=${GIT_TAG}
 
 .PHONY: deps
 deps:

build.gradle

@@ -1,12 +1,16 @@
 plugins {
-  id 'com.github.johnrengelman.shadow' version '5.2.0'
-  id 'java'
+  id 'application'
+  id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
 repositories {
   mavenCentral()
 }
 
+defaultTasks 'clean', 'test', 'build', 'shadowJar'
+
+mainClassName = 'com.tomczarniecki.s3.Main'
+
 configurations.all {
   exclude(group: 'commons-logging')
 }
@@ -35,12 +39,3 @@ dependencies {
 test {
   systemProperty "ignore.integration.tests", System.getProperty("ignore.integration.tests")
 }
-
-jar {
-  manifest {
-    attributes(
-      'Main-Class': 'com.tomczarniecki.s3.Main',
-      'Implementation-Version': archiveVersion?: 'dev'
-    )
-  }
-}

gradle.properties

@@ -0,0 +1 @@
+org.gradle.daemon=false

gradle/wrapper/gradle-wrapper.properties

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