From a29dabb31e79c73f4c2b068d68acf31dcf55de62 Mon Sep 17 00:00:00 2001 From: leonbcode Date: Mon, 13 Feb 2023 18:16:34 +0100 Subject: [PATCH 1/6] packaging via spring boot --- build.gradle | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index 2ae93a04..d668689c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,4 @@ plugins { - id 'java-library' - id 'maven-publish' - id 'com.github.johnrengelman.shadow' version '7.1.2' id 'org.springframework.boot' version '3.0.2' } @@ -16,15 +13,15 @@ repositories { } dependencies { - api 'org.springframework.boot:spring-boot-starter-thymeleaf:3.0.1' + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.0.1' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - api 'org.springframework:spring-beans:6.0.3' - api 'org.reflections:reflections:0.10.2' - api 'com.github.twitch4j:twitch4j:1.12.0' - api 'ch.qos.logback:logback-classic:1.4.5' - api 'org.springframework:spring-jdbc:5.3.23' - api 'org.junit.jupiter:junit-jupiter-api:5.9.1' + implementation 'org.springframework:spring-jdbc:5.3.23' + implementation 'org.springframework:spring-beans:6.0.3' + implementation 'org.reflections:reflections:0.10.2' + implementation 'com.github.twitch4j:twitch4j:1.13.0' + implementation 'ch.qos.logback:logback-classic:1.4.5' + implementation 'org.junit.jupiter:junit-jupiter-api:5.9.1' runtimeOnly 'org.springframework.boot:spring-boot-devtools:3.0.1' runtimeOnly 'org.mariadb.jdbc:mariadb-java-client:3.0.9' testImplementation 'org.springframework.boot:spring-boot-starter-test:3.0.1' @@ -35,14 +32,6 @@ version = '0.0.1-SNAPSHOT' description = 'JavaTwitchBot' java.sourceCompatibility = JavaVersion.VERSION_17 -publishing { - publications { - maven(MavenPublication) { - from(components.java) - } - } -} - tasks.withType(JavaCompile).configureEach { options.encoding = 'UTF-8' } From aebc16f4546037a5c754a4f61ea817f459382694 Mon Sep 17 00:00:00 2001 From: leonbcode Date: Mon, 13 Feb 2023 18:17:24 +0100 Subject: [PATCH 2/6] fix package name --- src/main/resources/logback.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index deeec68a..24349869 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -13,10 +13,10 @@ - - - - + + + + From 28363b0b3ff7e790a263864b025cb89d07434e41 Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 13 Feb 2023 18:53:47 +0100 Subject: [PATCH 3/6] use gradle-build-action to improve buildtimes --- .github/workflows/build.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 91782992..53c69d64 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,9 +14,7 @@ jobs: java-version: 17 distribution: 'adopt' cache: gradle - - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@v1 - - name: Build with Gradle - run: sudo chmod +x gradlew && ./gradlew build - - name: Compile code - run: ./gradlew shadowJar \ No newline at end of file + - name: Setup Gradle + uses: gradle/gradle-build-action@v2 + - name: Run build with Gradle Wrapper + run: ./gradlew build From ffef03fb3bf86fcb2506773336e458d7249b97f5 Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 13 Feb 2023 18:55:51 +0100 Subject: [PATCH 4/6] fix missing permissions on gradle build --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 53c69d64..95ba26fa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,4 +17,4 @@ jobs: - name: Setup Gradle uses: gradle/gradle-build-action@v2 - name: Run build with Gradle Wrapper - run: ./gradlew build + run: sudo chmod +x gradlew && ./gradlew build From b60d8a40c5a5121d132ff7df46e2914656a46e6b Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 13 Feb 2023 19:04:17 +0100 Subject: [PATCH 5/6] specify gradle version in build action --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 95ba26fa..7af21b63 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,5 +16,7 @@ jobs: cache: gradle - name: Setup Gradle uses: gradle/gradle-build-action@v2 + with: + gradle-version: 7.6 - name: Run build with Gradle Wrapper run: sudo chmod +x gradlew && ./gradlew build From 55f8fd648ca6e93190ef86e5ec288f3b5d807495 Mon Sep 17 00:00:00 2001 From: Leon Date: Mon, 13 Feb 2023 19:06:51 +0100 Subject: [PATCH 6/6] use cached gradle wrapper --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7af21b63..28809efe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,4 +19,4 @@ jobs: with: gradle-version: 7.6 - name: Run build with Gradle Wrapper - run: sudo chmod +x gradlew && ./gradlew build + run: gradle build