Update Gradle stuff

Author: opatry

.github/workflows/Build.yml

@@ -14,11 +14,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v2
+    - uses: actions/checkout@v4
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'adopt'
 
     - name: Build
@@ -27,16 +27,16 @@ jobs:
             ./gradlew --no-daemon compileReleaseSources
 
     - name: Test
-      run: ./gradlew --no-daemon test -x testDebug
+      run: ./gradlew --no-daemon test
 
     - name: Lint
       run: ./gradlew --no-daemon :wordle-compose-android:lintRelease -x lint
 
-    - name: Publish Test Results
-      uses: EnricoMi/[email protected]
-      if: failure()
+    - name: Publish Test Reports
+      uses: mikepenz/action-junit-report@v4
+      if: success() || failure()
       with:
-        files: ./**/build/test-results/test/TEST-*.xml
+        report_paths: '**/build/test-results/test/TEST-*.xml'
 
     - name: Dist
       env:

.gitignore

@@ -1,6 +1,10 @@
 .gradle/
 *.iml
 
+.idea/deploymentTargetDropDown.xml
+.idea/kotlinc.xml
+.idea/migrations.xml
+
 local.properties
 
 build/

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://github.com/opatry/wordle-kt/workflows/Build/badge.svg)](https://github.com/opatry/wordle-kt/actions/workflows/Build.yml)
+[![Build Status](https://github.com/opatry/wordle-kt/actions/workflows/Build.yml/badge.svg)](https://github.com/opatry/wordle-kt/actions/workflows/Build.yml)
 
 # Wordle Compose
 

build.gradle

@@ -0,0 +1,41 @@
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+
+buildscript {
+    repositories {
+        mavenCentral()
+        google()
+    }
+}
+
+plugins {
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.jetbrains.kotlin.android) apply false
+    alias(libs.plugins.jetbrains.kotlin.jvm) apply false
+    alias(libs.plugins.jetbrains.compose) apply false
+}
+
+allprojects {
+    repositories {
+        mavenCentral()
+        google()
+    }
+}
+
+subprojects {
+    tasks {
+        findByName("test") ?: return@tasks
+        named<Test>("test") {
+            ignoreFailures = true
+            testLogging {
+                events("failed", "passed", "skipped")
+
+                exceptionFormat = TestExceptionFormat.SHORT
+
+                debug {
+                    exceptionFormat = TestExceptionFormat.FULL
+                }
+            }
+        }
+    }
+}

build.gradle.kts

@@ -0,0 +1,7 @@
+plugins {
+    alias(libs.plugins.jetbrains.kotlin.jvm)
+}
+
+dependencies {
+    testImplementation(libs.junit4)
+}

game-logic/build.gradle

@@ -0,0 +1,49 @@
+[versions]
+
+wordleKt = "0.1.0"
+
+agp = "8.1.0"
+
+compileSdk = "34"
+minSdk = "21"
+targetSdk = "34"
+
+kotlin = "1.9.10"
+kotlinx-coroutines = "1.7.3"
+
+compose = "1.5.3"
+
+[libraries]
+kotlin = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
+kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
+kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "kotlinx-coroutines" }
+kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" }
+
+androidx-appcompat = "androidx.appcompat:appcompat:1.6.1"
+androidx-activity-compose = "androidx.activity:activity-compose:1.8.2"
+
+androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
+androidx-compose-uiTooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
+androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
+androidx-compose-material = { module = "androidx.compose.material:material", version.ref = "compose" }
+
+jetbrains-compose-material = { module = "org.jetbrains.compose.material:material", version.ref = "compose" }
+jetbrains-compose-material-icons-extended-desktop = { module = "org.jetbrains.compose.material:material-icons-extended-desktop", version.ref = "compose" }
+jetbrains-compose-material-desktop = { module = "org.jetbrains.compose.material:material-desktop", version.ref = "compose" }
+
+accompanist-insets = "com.google.accompanist:accompanist-insets:0.25.1"
+
+gson = "com.google.code.gson:gson:2.10.1"
+
+junit4 = "junit:junit:4.13.2"
+
+[bundles]
+jetbrains-compose = [ "jetbrains-compose-material", "jetbrains-compose-material-desktop", "jetbrains-compose-material-icons-extended-desktop" ]
+androidx-compose = [ "androidx-compose-ui", "androidx-compose-uiTooling", "androidx-compose-foundation", "androidx-compose-material" ]
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "agp" }
+android-library = { id = "com.android.library", version.ref = "agp" }
+jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+jetbrains-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "compose" }

game-logic/build.gradle.kts

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