diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 5429839..46c9bbe 100644 --- a/.github/workflows/Build.yml +++ b/.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/publish-unit-test-result-action@v1.26 - 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: diff --git a/.gitignore b/.gitignore index 081d22c..9ae137c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,10 @@ .gradle/ *.iml +.idea/deploymentTargetDropDown.xml +.idea/kotlinc.xml +.idea/migrations.xml + local.properties build/ diff --git a/README.md b/README.md index df5d965..4b3655c 100644 --- a/README.md +++ b/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 diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 00ebdd4..0000000 --- a/build.gradle +++ /dev/null @@ -1,77 +0,0 @@ -buildscript { - repositories { - mavenCentral() - google() - } - - dependencies { - classpath 'com.android.tools.build:gradle:7.2.2' - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.0' - } -} - -allprojects { - repositories { - mavenCentral() - google() - } -} - -subprojects { - afterEvaluate { proj -> - - if (proj.hasProperty('android')) { - android { - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - if (proj.hasProperty('kotlin')) { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() - } - } - - testOptions { - unitTests.all { - // let JUnit report mark the job status in case of error - ignoreFailures = true - testLogging { - events "passed", "skipped", "failed" - exceptionFormat "short" - - debug { - exceptionFormat "full" - } - } - } - } - } - } - - if (proj.hasProperty('kotlin') && !proj.hasProperty('android')) { - compileKotlin { - kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8 - } - compileTestKotlin { - kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8 - } - } - - if (proj.hasProperty('test')) { - test { - // let JUnit report mark the job status in case of error - ignoreFailures = true - testLogging { - events 'passed', 'skipped', 'failed' - exceptionFormat 'short' - - debug { - exceptionFormat 'full' - } - } - } - } - } -} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..d08b960 --- /dev/null +++ b/build.gradle.kts @@ -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") { + ignoreFailures = true + testLogging { + events("failed", "passed", "skipped") + + exceptionFormat = TestExceptionFormat.SHORT + + debug { + exceptionFormat = TestExceptionFormat.FULL + } + } + } + } +} diff --git a/game-logic/build.gradle b/game-logic/build.gradle deleted file mode 100644 index 074a0c0..0000000 --- a/game-logic/build.gradle +++ /dev/null @@ -1,8 +0,0 @@ -plugins { - id 'java-library' - id 'kotlin' -} - -dependencies { - testImplementation 'junit:junit:4.13.2' -} \ No newline at end of file diff --git a/game-logic/build.gradle.kts b/game-logic/build.gradle.kts new file mode 100644 index 0000000..c3b28ba --- /dev/null +++ b/game-logic/build.gradle.kts @@ -0,0 +1,7 @@ +plugins { + alias(libs.plugins.jetbrains.kotlin.jvm) +} + +dependencies { + testImplementation(libs.junit4) +} \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..ceb6ea1 --- /dev/null +++ b/gradle/libs.versions.toml @@ -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" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..d64cd49 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e6e589..1af9e09 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/gradlew b/gradlew index 1b6c787..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -205,6 +214,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index ac1b06f..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 26eb090..0000000 --- a/settings.gradle +++ /dev/null @@ -1,7 +0,0 @@ -rootProject.name = 'Wordle Kotlin' - -include('game-logic') -include('word-data') -include('wordle-ascii-cli') -include('wordle-compose-desktop') -include('wordle-compose-android') diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..ee3e223 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,15 @@ +pluginManagement { + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +rootProject.name = "Wordle Kotlin" + +include("game-logic") +include("word-data") +include("wordle-ascii-cli") +include("wordle-compose-desktop") +include("wordle-compose-android") diff --git a/wordle-ascii-cli/build.gradle b/wordle-ascii-cli/build.gradle deleted file mode 100644 index ec17052..0000000 --- a/wordle-ascii-cli/build.gradle +++ /dev/null @@ -1,9 +0,0 @@ -plugins { - id 'java-library' - id 'kotlin' -} - -dependencies { - implementation(project(':word-data')) - implementation(project(':game-logic')) -} \ No newline at end of file diff --git a/wordle-ascii-cli/build.gradle.kts b/wordle-ascii-cli/build.gradle.kts new file mode 100644 index 0000000..94089ac --- /dev/null +++ b/wordle-ascii-cli/build.gradle.kts @@ -0,0 +1,8 @@ +plugins { + alias(libs.plugins.jetbrains.kotlin.jvm) +} + +dependencies { + implementation(project(":word-data")) + implementation(project(":game-logic")) +} \ No newline at end of file diff --git a/wordle-compose-android/build.gradle b/wordle-compose-android/build.gradle deleted file mode 100644 index 862f058..0000000 --- a/wordle-compose-android/build.gradle +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright (c) 2022 Olivier Patry - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the Software - * is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE - * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -plugins { - id 'com.android.application' - id 'kotlin-android' -} - -def compose_version = '1.2.0' - -android { - compileSdkVersion 33 - - defaultConfig { - applicationId 'net.opatry.games.wordle' - minSdkVersion 23 - targetSdkVersion 31 - versionCode 1 - versionName '0.1.0' - - resConfigs 'en', 'fr' - } - - signingConfigs { - dev { - storeFile file('dev.keystore') - storePassword 'devdev' - keyAlias 'dev' - keyPassword 'devdev' - } - prod { - def keystoreFilePath = findProperty('playstore.keystore.file') ?: null - storeFile = keystoreFilePath ? file(keystoreFilePath) : null - storePassword = findProperty('playstore.keystore.password') - keyAlias = 'wordle_compose_android' - keyPassword = findProperty('playstore.keystore.key_password') - } - } - - buildTypes { - debug { - signingConfig signingConfigs.dev - } - release { - // we allow dev signing config in release build when not in CI to allow release builds on dev machine - def ciBuild = findProperty('ci') ?: false - if (signingConfigs.prod.storeFile == null && !ciBuild) { - signingConfig signingConfigs.dev - } else { - signingConfig signingConfigs.prod - } - - minifyEnabled true - shrinkResources true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - - lint { - checkDependencies true - } - - buildFeatures { - compose true - } - - composeOptions { - kotlinCompilerExtensionVersion compose_version - } -} - -dependencies { - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4' - implementation 'com.google.code.gson:gson:2.9.0' - - implementation 'androidx.appcompat:appcompat:1.4.1' - - implementation "androidx.compose.ui:ui:${compose_version}" - implementation "androidx.compose.ui:ui-tooling:${compose_version}" - implementation "androidx.compose.foundation:foundation:${compose_version}" - implementation "androidx.compose.material:material:${compose_version}" - implementation 'androidx.activity:activity-compose:1.4.0' - - implementation 'com.google.accompanist:accompanist-insets:0.25.1' - - implementation project(':word-data') - implementation project(':game-logic') -} diff --git a/wordle-compose-android/build.gradle.kts b/wordle-compose-android/build.gradle.kts new file mode 100644 index 0000000..8d0a084 --- /dev/null +++ b/wordle-compose-android/build.gradle.kts @@ -0,0 +1,116 @@ +/* + * Copyright (c) 2022 Olivier Patry + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the Software + * is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.jetbrains.kotlin.android) +} + +android { + namespace = "net.opatry.game.wordle" + compileSdk = libs.versions.compileSdk.get().toInt() + + defaultConfig { + applicationId = "net.opatry.games.wordle" + minSdk = libs.versions.minSdk.get().toInt() + targetSdk = libs.versions.targetSdk.get().toInt() + versionCode = 1 + versionName = libs.versions.wordleKt.get() + + resourceConfigurations += listOf("en", "fr") + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + kotlin { + jvmToolchain(17) + } + + lint { + disable += "InvalidVectorPath" + } + + signingConfigs { + create("dev") { + storeFile = file("dev.keystore") + storePassword = "devdev" + keyAlias = "dev" + keyPassword = "devdev" + } + create("prod") { + val keystoreFilePath = findProperty("playstore.keystore.file") as? String + storeFile = keystoreFilePath?.let(::file) + storePassword = findProperty("playstore.keystore.password") as? String + keyAlias = "wordle_compose_android" + keyPassword = findProperty("playstore.keystore.key_password") as? String + } + } + + buildTypes { + getByName("debug") { + signingConfig = signingConfigs.getByName("dev") + } + getByName("release") { + // we allow dev signing config in release build when not in CI to allow release builds on dev machine + val ciBuild = (findProperty("ci") as? String)?.toBoolean() ?: false + signingConfig = if (signingConfigs.getByName("prod").storeFile == null && !ciBuild) { + signingConfigs.getByName("dev") + } else { + signingConfigs.getByName("prod") + } + + isMinifyEnabled = true + isShrinkResources = true + proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") + } + } + + lint { + checkDependencies = true + } + + buildFeatures { + compose = true + } + + composeOptions { + kotlinCompilerExtensionVersion = libs.versions.compose.get() + } +} + +dependencies { + implementation(libs.kotlinx.coroutines.core) + implementation(libs.gson) + + implementation(libs.androidx.appcompat) + implementation(libs.androidx.activity.compose) + + implementation(libs.bundles.androidx.compose) + + implementation(libs.accompanist.insets) + + implementation(project(":word-data")) + implementation(project(":game-logic")) +} diff --git a/wordle-compose-android/src/main/AndroidManifest.xml b/wordle-compose-android/src/main/AndroidManifest.xml index 26abcfc..a296550 100644 --- a/wordle-compose-android/src/main/AndroidManifest.xml +++ b/wordle-compose-android/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + - + \ No newline at end of file diff --git a/wordle-compose-desktop/build.gradle b/wordle-compose-desktop/build.gradle.kts similarity index 63% rename from wordle-compose-desktop/build.gradle rename to wordle-compose-desktop/build.gradle.kts index 6087e78..be8c365 100644 --- a/wordle-compose-desktop/build.gradle +++ b/wordle-compose-desktop/build.gradle.kts @@ -21,43 +21,41 @@ */ plugins { - id 'org.jetbrains.kotlin.jvm' - id 'org.jetbrains.compose' version '1.2.0-alpha01-dev755' - id 'application' + alias(libs.plugins.jetbrains.kotlin.jvm) + alias(libs.plugins.jetbrains.compose) + application } repositories { // Needed to fetch material icons for Desktop - maven { - url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' - } + maven(url = "https://maven.pkg.jetbrains.space/public/p/compose/dev") } -group 'net.opatry.game' -version '1.0.0' +group = "net.opatry.game" +version = libs.versions.wordleKt.get() dependencies { implementation(compose.desktop.currentOs) - implementation('org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4') - implementation('org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.6.4') { - because 'requires Dispatchers.Main & co at runtime for Jvm' - // java.lang.IllegalStateException: Module with the Main dispatcher is missing. Add dependency providing the Main dispatcher, e.g. 'kotlinx-coroutines-android' and ensure it has the same version as 'kotlinx-coroutines-core' + implementation(libs.kotlinx.coroutines.core) + implementation(libs.kotlinx.coroutines.swing) { + because("requires Dispatchers.Main & co at runtime for Jvm") + // java.lang.IllegalStateException: Module with the Main dispatcher is missing. Add dependency providing the Main dispatcher, e.g. "kotlinx-coroutines-android" and ensure it has the same version as "kotlinx-coroutines-core" // see also https://github.com/JetBrains/compose-jb/releases/tag/v1.1.1 } - implementation('com.google.code.gson:gson:2.9.0') + implementation(libs.gson) // TODO depends on such icons when compatible with up to date compiler & runtime // For now, having this as dependency leads to `Unresolved reference: loadImageBitmap` // If using compiler plugin 1.0.0 (instead of 1.0.1) with Kotlin 1.5.31, still compilation issue - // When removed such error, crashes at runtime: java.lang.NoSuchMethodError: 'long androidx.compose.ui.unit.DpKt.DpSize-YgX7TsA(float, float)' -// implementation 'androidx.compose.material:material-icons-core-desktop:1.0.0-beta06' -// implementation 'androidx.compose.material:material-icons-extended-desktop:1.0.0-beta06' + // When removed such error, crashes at runtime: java.lang.NoSuchMethodError: "long androidx.compose.ui.unit.DpKt.DpSize-YgX7TsA(float, float)" +// implementation "androidx.compose.material:material-icons-core-desktop:1.0.0-beta06" +// implementation "androidx.compose.material:material-icons-extended-desktop:1.0.0-beta06" - implementation(project(':word-data')) - implementation(project(':game-logic')) + implementation(project(":word-data")) + implementation(project(":game-logic")) } application { - mainClass = 'net.opatry.game.wordle.ui.compose.WordleComposeDesktopKt' + mainClass = "net.opatry.game.wordle.ui.compose.WordleComposeDesktopKt" }