Merge pull request #16 from Bram--/dev

Version 0.4.4
Bram-- · Feb 22, 2024 · 5dfd561 · 5dfd561
2 parents 093caa3 + e68edff
commit 5dfd561
Show file tree

Hide file tree

Showing 55 changed files with 2,030 additions and 836 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,16 +7,13 @@ on:
       - main
       - release
   pull_request:
-    branches:
-      - main
-      - dev
-      - release
 
 jobs:
   build:
     name: build
-    permissions: write-all
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
     steps:
       - uses: actions/checkout@v4
 
@@ -48,7 +45,8 @@ jobs:
         uses: madrapps/jacoco-report@v1.6.1
         with:
           paths: |
-            ${{ github.workspace }}/build/jacoco/jacocoTestReport.xml,
+            ${{ github.workspace }}/build/jacoco/test/jacocoTestReport.xml,
           token: ${{ secrets.GITHUB_TOKEN }}
           min-coverage-overall: 40
           min-coverage-changed-files: 60
+          update-comment: true
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -7,10 +7,6 @@ on:
       - main
       - release
   pull_request:
-    branches:
-      - main
-      - dev
-      - release
 
 jobs:
   build:
@@ -35,7 +31,7 @@ jobs:
             ${{ runner.os }}-gradle-
           working-directory: ${{ matrix.dir }}
 
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           distribution: 'corretto'
           java-version: '17'

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -16,7 +16,7 @@ publishing {
         create<MavenPublication>("maven") {
             groupId = "org.audux.bgg"
             artifactId = "bggclient"
-            version = "0.4.1"
+            version = "0.4.4"
 
             pom {
                 name = "Unofficial JVM BGG client"
@@ -74,7 +74,8 @@ dependencies {
     // Testing dependencies.
     testApi(libs.ktor.client.mock)
 
-    testImplementation(libs.junit5.api)
+    testImplementation(libs.junit5.jupiter)
+    testImplementation(libs.junit5.params)
     testImplementation(libs.truth)
 
     testRuntimeOnly(libs.junit5.engine)

diff --git a/examples/android/app/build.gradle.kts b/examples/android/app/build.gradle.kts
@@ -68,7 +68,7 @@ dependencies {
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
     implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0")
     implementation("io.coil-kt:coil-compose:2.5.0")
-    implementation("org.audux.bgg:bggclient:0.4.1")
+    implementation("org.audux.bgg:bggclient:0.4.4")
 
     testImplementation("junit:junit:4.13.2")
 

diff --git a/examples/java/build.gradle.kts b/examples/java/build.gradle.kts
@@ -12,7 +12,7 @@ repositories {
 }
 
 dependencies {
-    implementation("org.audux.bgg:bggclient:0.4.1")
+    implementation("org.audux.bgg:bggclient:0.4.4")
 
     testImplementation(platform("org.junit:junit-bom:5.9.1"))
     testImplementation("org.junit.jupiter:junit-jupiter")

diff --git a/examples/java/src/main/java/org/audux/bgg/examples/java/Main.java b/examples/java/src/main/java/org/audux/bgg/examples/java/Main.java
@@ -53,10 +53,10 @@ public static void main(String[] args) throws Exception {
                             response.getName(),
                             response.getStateOrProvince() == null
                                     ? ""
-                                    : response.getStateOrProvince().getValue(),
-                            response.getCountry() == null ? "" : response.getCountry().getValue(),
-                            response.getBuddies() == null ? "0" : response.getBuddies().getTotal(),
-                            response.getGuilds() == null ? "0" : response.getGuilds().getTotal(),
+                                    : response.getStateOrProvince(),
+                            response.getCountry() == null ? "" : response.getCountry(),
+                            response.getBuddies() == null ? "0" : response.getBuddies(),
+                            response.getGuilds() == null ? "0" : response.getGuilds(),
                             response.getTop() == null ? "0" : response.getTop().getItems().size(),
                             response.getHot() == null ? "0" : response.getHot().getItems().size())
                     .trim());

diff --git a/examples/paginate/build.gradle.kts b/examples/paginate/build.gradle.kts
@@ -20,7 +20,7 @@ application {
 }
 
 dependencies {
-    implementation("org.audux.bgg:bggclient:0.4.1")
+    implementation("org.audux.bgg:bggclient:0.4.4")
 
     testImplementation("org.jetbrains.kotlin:kotlin-test")
 }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ junit5 = "5.8.1"
 kermit = "2.0.2"
 ktfmt-gradle = "0.15.1"
 ktor = "2.3.+"
-org-jetbrains-kotlin-jvm = "1.9.10"
+org-jetbrains-kotlin-jvm = "1.9.22"
 org-jetbrains-kotlin-jdk8 = "1.7.3"
 serialization = "1.6.1"
 slf4j = "1.7.36"
@@ -18,7 +18,9 @@ jackson-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr
 jackson-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
 jackson-xml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-xml", version.ref = "jackson" }
 junit5-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit5" }
+junit5-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit5" }
 junit5-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit5" }
+junit5-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit5" }
 kermit = { module = "co.touchlab:kermit", version.ref = "kermit" }
 kotlin-coroutines-jdk8 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8", version.ref = "org-jetbrains-kotlin-jdk8" }
 kotlin-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "dateTime" }
@@ -32,3 +34,4 @@ truth = { module = "com.google.truth:truth", version.ref = "truth" }
 [plugins]
 org-jetbrains-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "org-jetbrains-kotlin-jvm" }
 ktfmt-gradle = { id = "com.ncorti.ktfmt.gradle", version.ref = "ktfmt-gradle" }
+