diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d248a801..67f93aeb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,44 +12,31 @@ jobs: runs-on: macos-14 steps: - uses: actions/checkout@v4 - - uses: gradle/wrapper-validation-action@v3 - - uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '17' - - uses: ruby/setup-ruby@v1 with: ruby-version: '3.2' bundler-cache: true - - - name: assemble - uses: gradle/gradle-build-action@v3 + - uses: gradle/actions/setup-gradle@v3 with: - arguments: assemble + validate-wrappers: true - - name: check jacocoTestReport - uses: gradle/gradle-build-action@v3 - with: - arguments: check jacocoTestReport + - run: ./gradlew assemble + - run: ./gradlew jacocoTestReport - - uses: EnricoMi/publish-unit-test-result-action/composite@v2 + - uses: EnricoMi/publish-unit-test-result-action/macos@v2 with: junit_files: '**/build/test-results/**/*.xml' report_individual_runs: 'true' - uses: codecov/codecov-action@v4 - - name: publishToMavenLocal - uses: gradle/gradle-build-action@v3 - with: - arguments: | - -PVERSION_NAME=unspecified - -PRELEASE_SIGNING_ENABLED=false - publishToMavenLocal - - - name: Website - uses: gradle/gradle-build-action@v3 - with: - arguments: :website:browserBuild + - run: > + ./gradlew + -PVERSION_NAME=unspecified + -PRELEASE_SIGNING_ENABLED=false + publishToMavenLocal + - run: ./gradlew :website:browserBuild diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 5a81bb63..fa237146 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -19,28 +19,21 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: gradle/wrapper-validation-action@v3 - - uses: actions/configure-pages@v5 id: pages - - uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '17' - - uses: ruby/setup-ruby@v1 with: ruby-version: '3.2' bundler-cache: true - - - name: Website - uses: gradle/gradle-build-action@v3 + - uses: gradle/actions/setup-gradle@v3 with: cache-read-only: true - arguments: | - -Pbaseurl=${{ steps.pages.outputs.base_path }} - :website:browserBuild + + - run: ./gradlew -Pbaseurl='${{ steps.pages.outputs.base_path }}' :website:browserBuild - uses: JamesIves/github-pages-deploy-action@v4 with: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f959eb94..c8aa8348 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -9,24 +9,20 @@ jobs: runs-on: macos-14 steps: - uses: actions/checkout@v4 - - uses: gradle/wrapper-validation-action@v3 - uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '17' + - uses: gradle/actions/setup-gradle@v3 - - name: check - uses: gradle/gradle-build-action@v3 - with: - arguments: check + - run: ./gradlew check - name: publish - uses: gradle/gradle-build-action@v3 - with: - arguments: | - -PVERSION_NAME=${{ github.ref_name }} - -PsigningInMemoryKey=${{ secrets.SIGNING_KEY }} - -PsigningInMemoryKeyPassword=${{ secrets.SIGNING_PASSWORD }} - -PmavenCentralUsername=${{ secrets.OSS_SONATYPE_NEXUS_USERNAME }} - -PmavenCentralPassword=${{ secrets.OSS_SONATYPE_NEXUS_PASSWORD }} - publish + run: > + ./gradlew + -PVERSION_NAME='${{ github.ref_name }}' + -PsigningInMemoryKey='${{ secrets.SIGNING_KEY }}' + -PsigningInMemoryKeyPassword='${{ secrets.SIGNING_PASSWORD }}' + -PmavenCentralUsername='${{ secrets.OSS_SONATYPE_NEXUS_USERNAME }}' + -PmavenCentralPassword='${{ secrets.OSS_SONATYPE_NEXUS_PASSWORD }}' + publish diff --git a/.github/workflows/signing.yml b/.github/workflows/signing.yml index 0f3f51ca..107147d3 100644 --- a/.github/workflows/signing.yml +++ b/.github/workflows/signing.yml @@ -10,16 +10,15 @@ jobs: runs-on: macos-14 steps: - uses: actions/checkout@v4 - - uses: gradle/wrapper-validation-action@v3 - uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '17' + - uses: gradle/actions/setup-gradle@v3 - name: publishToMavenLocal - uses: gradle/gradle-build-action@v3 - with: - arguments: | - -PsigningInMemoryKey=${{ secrets.SIGNING_KEY }} - -PsigningInMemoryKeyPassword=${{ secrets.SIGNING_PASSWORD }} - publishToMavenLocal + run: > + ./gradlew + -PsigningInMemoryKey='${{ secrets.SIGNING_KEY }}' + -PsigningInMemoryKeyPassword='${{ secrets.SIGNING_PASSWORD }}' + publishToMavenLocal diff --git a/axis/gradle.properties b/axis/gradle.properties deleted file mode 100644 index 7b3aaa40..00000000 --- a/axis/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -POM_ARTIFACT_ID=axis diff --git a/box/gradle.properties b/box/gradle.properties deleted file mode 100644 index fa52bdda..00000000 --- a/box/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -POM_ARTIFACT_ID=box diff --git a/color/gradle.properties b/color/gradle.properties deleted file mode 100644 index 290c3069..00000000 --- a/color/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -POM_ARTIFACT_ID=color diff --git a/element-view/gradle.properties b/element-view/gradle.properties deleted file mode 100644 index 0604e374..00000000 --- a/element-view/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -POM_ARTIFACT_ID=element-view diff --git a/element/gradle.properties b/element/gradle.properties deleted file mode 100644 index c1a21b3e..00000000 --- a/element/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -POM_ARTIFACT_ID=element diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 60967242..ca12894f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,26 +1,26 @@ [versions] -agp = "8.3.2" # 7.4.1 is the maximum version supported by IDEA 2023.1 +agp = "8.4.1" # 7.4.1 is the maximum version supported by IDEA 2023.1 android-compile = "34" android-min = "21" android-target = "32" -compose = "1.6.2" -coroutines = "1.8.0" +compose = "1.6.10" +coroutines = "1.8.1" jacoco = "0.8.7" jvm-toolchain = "11" -kotlin = "1.9.23" +kotlin = "1.9.24" [libraries] androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.9.0" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.6.1" } -androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version = "2.7.0" } +androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version = "2.8.0" } androidx-test = { module = "androidx.test:core", version = "1.5.0" } coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" } coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" } coroutines-js = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core-js", version.ref = "coroutines" } coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" } -datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0.5.0" } -material = { module = "com.google.android.material:material", version = "1.11.0" } -robolectric = { module = "org.robolectric:robolectric", version = "4.12.1" } +datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0.6.0" } +material = { module = "com.google.android.material:material", version = "1.12.0" } +robolectric = { module = "org.robolectric:robolectric", version = "4.12.2" } [plugins] android-application = { id = "com.android.application", version.ref = "agp" } diff --git a/hierarchy/gradle.properties b/hierarchy/gradle.properties deleted file mode 100644 index 72a6963b..00000000 --- a/hierarchy/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -POM_ARTIFACT_ID=hierarchy diff --git a/interpolate/gradle.properties b/interpolate/gradle.properties deleted file mode 100644 index c9bdf111..00000000 --- a/interpolate/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -POM_ARTIFACT_ID=interpolate diff --git a/kanvas/gradle.properties b/kanvas/gradle.properties deleted file mode 100644 index 5f198675..00000000 --- a/kanvas/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -POM_ARTIFACT_ID=kanvas diff --git a/scale/gradle.properties b/scale/gradle.properties deleted file mode 100644 index 8b4257a2..00000000 --- a/scale/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -POM_ARTIFACT_ID=scale diff --git a/selection/gradle.properties b/selection/gradle.properties deleted file mode 100644 index 5cda1142..00000000 --- a/selection/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -POM_ARTIFACT_ID=selection diff --git a/settings.gradle.kts b/settings.gradle.kts index 073f918c..0363b01f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,7 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") +rootProject.name = "krayon" + pluginManagement { repositories { google() diff --git a/shape/gradle.properties b/shape/gradle.properties deleted file mode 100644 index 76955ab2..00000000 --- a/shape/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -POM_ARTIFACT_ID=shape diff --git a/time/gradle.properties b/time/gradle.properties deleted file mode 100644 index 33e8d7b1..00000000 --- a/time/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -POM_ARTIFACT_ID=time diff --git a/website/Gemfile.lock b/website/Gemfile.lock index d4f15949..f161733a 100644 --- a/website/Gemfile.lock +++ b/website/Gemfile.lock @@ -76,7 +76,8 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rexml (3.2.6) + rexml (3.2.8) + strscan (>= 3.0.9) rouge (4.2.0) rubyzip (2.3.2) safe_yaml (1.0.5) @@ -84,6 +85,7 @@ GEM google-protobuf (~> 3.25) sass-embedded (1.69.7-x86_64-linux-gnu) google-protobuf (~> 3.25) + strscan (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) unicode-display_width (2.5.0)