fun

mareklangiewicz · Feb 1, 2025 · db435c5 · db435c5
1 parent 46638ff
commit db435c5
Show file tree

Hide file tree

Showing 27 changed files with 352 additions and 539 deletions.
diff --git a/.github/workflows/dbuild.yml b/.github/workflows/dbuild.yml
@@ -10,27 +10,27 @@ on:
     - 'main'
   pull_request: {}
   workflow_dispatch: {}
+env:
+  MYKOTLIBS_signing_keyId: '${{ secrets.MYKOTLIBS_signing_keyId }}'
+  MYKOTLIBS_signing_password: '${{ secrets.MYKOTLIBS_signing_password }}'
+  MYKOTLIBS_signing_key: '${{ secrets.MYKOTLIBS_signing_key }}'
+  MYKOTLIBS_ossrhUsername: '${{ secrets.MYKOTLIBS_ossrhUsername }}'
+  MYKOTLIBS_ossrhPassword: '${{ secrets.MYKOTLIBS_ossrhPassword }}'
+  MYKOTLIBS_sonatypeStagingProfileId: '${{ secrets.MYKOTLIBS_sonatypeStagingProfileId }}'
 jobs:
   build-for-UbuntuLatest:
     runs-on: 'ubuntu-latest'
-    env:
-      MYKOTLIBS_signing_keyId: '${{ secrets.MYKOTLIBS_signing_keyId }}'
-      MYKOTLIBS_signing_password: '${{ secrets.MYKOTLIBS_signing_password }}'
-      MYKOTLIBS_signing_key: '${{ secrets.MYKOTLIBS_signing_key }}'
-      MYKOTLIBS_ossrhUsername: '${{ secrets.MYKOTLIBS_ossrhUsername }}'
-      MYKOTLIBS_ossrhPassword: '${{ secrets.MYKOTLIBS_ossrhPassword }}'
-      MYKOTLIBS_sonatypeStagingProfileId: '${{ secrets.MYKOTLIBS_sonatypeStagingProfileId }}'
     steps:
     - id: 'step-0'
       uses: 'actions/checkout@v4'
     - id: 'step-1'
       name: 'Set up JDK'
       uses: 'actions/setup-java@v4'
       with:
-        java-version: '22'
+        java-version: '23'
         distribution: 'zulu'
     - id: 'step-2'
-      name: 'Build'
-      uses: 'gradle/actions/setup-gradle@v3'
-      with:
-        arguments: 'build'
+      uses: 'gradle/actions/setup-gradle@v4'
+    - id: 'step-3'
+      name: 'build'
+      run: './gradlew build --no-configuration-cache --no-parallel'
diff --git a/.github/workflows/ddepsub.yml b/.github/workflows/ddepsub.yml
@@ -0,0 +1,34 @@
+# This file was generated using a Kotlin DSL.
+# If you want to modify the workflow, please change the Kotlin source and regenerate this YAML file.
+# Generated with https://github.com/typesafegithub/github-workflows-kt
+
+name: 'ddepsub'
+on:
+  push:
+    branches:
+    - 'master'
+    - 'main'
+  workflow_dispatch: {}
+env:
+  MYKOTLIBS_signing_keyId: '${{ secrets.MYKOTLIBS_signing_keyId }}'
+  MYKOTLIBS_signing_password: '${{ secrets.MYKOTLIBS_signing_password }}'
+  MYKOTLIBS_signing_key: '${{ secrets.MYKOTLIBS_signing_key }}'
+  MYKOTLIBS_ossrhUsername: '${{ secrets.MYKOTLIBS_ossrhUsername }}'
+  MYKOTLIBS_ossrhPassword: '${{ secrets.MYKOTLIBS_ossrhPassword }}'
+  MYKOTLIBS_sonatypeStagingProfileId: '${{ secrets.MYKOTLIBS_sonatypeStagingProfileId }}'
+jobs:
+  dependency-submission-on-UbuntuLatest:
+    runs-on: 'ubuntu-latest'
+    permissions:
+      contents: 'write'
+    steps:
+    - id: 'step-0'
+      uses: 'actions/checkout@v4'
+    - id: 'step-1'
+      name: 'Set up JDK'
+      uses: 'actions/setup-java@v4'
+      with:
+        java-version: '23'
+        distribution: 'zulu'
+    - id: 'step-2'
+      uses: 'gradle/actions/dependency-submission@v4'
diff --git a/.github/workflows/drelease.yml b/.github/workflows/drelease.yml
@@ -7,30 +7,30 @@ on:
   push:
     tags:
     - 'v*.*.*'
+env:
+  MYKOTLIBS_signing_keyId: '${{ secrets.MYKOTLIBS_signing_keyId }}'
+  MYKOTLIBS_signing_password: '${{ secrets.MYKOTLIBS_signing_password }}'
+  MYKOTLIBS_signing_key: '${{ secrets.MYKOTLIBS_signing_key }}'
+  MYKOTLIBS_ossrhUsername: '${{ secrets.MYKOTLIBS_ossrhUsername }}'
+  MYKOTLIBS_ossrhPassword: '${{ secrets.MYKOTLIBS_ossrhPassword }}'
+  MYKOTLIBS_sonatypeStagingProfileId: '${{ secrets.MYKOTLIBS_sonatypeStagingProfileId }}'
 jobs:
   release:
     runs-on: 'ubuntu-latest'
-    env:
-      MYKOTLIBS_signing_keyId: '${{ secrets.MYKOTLIBS_signing_keyId }}'
-      MYKOTLIBS_signing_password: '${{ secrets.MYKOTLIBS_signing_password }}'
-      MYKOTLIBS_signing_key: '${{ secrets.MYKOTLIBS_signing_key }}'
-      MYKOTLIBS_ossrhUsername: '${{ secrets.MYKOTLIBS_ossrhUsername }}'
-      MYKOTLIBS_ossrhPassword: '${{ secrets.MYKOTLIBS_ossrhPassword }}'
-      MYKOTLIBS_sonatypeStagingProfileId: '${{ secrets.MYKOTLIBS_sonatypeStagingProfileId }}'
     steps:
     - id: 'step-0'
       uses: 'actions/checkout@v4'
     - id: 'step-1'
       name: 'Set up JDK'
       uses: 'actions/setup-java@v4'
       with:
-        java-version: '22'
+        java-version: '23'
         distribution: 'zulu'
     - id: 'step-2'
-      name: 'Build'
-      uses: 'gradle/actions/setup-gradle@v3'
-      with:
-        arguments: 'build'
+      uses: 'gradle/actions/setup-gradle@v4'
     - id: 'step-3'
-      name: 'Publish to Sonatype'
+      name: 'build'
+      run: './gradlew build --no-configuration-cache --no-parallel'
+    - id: 'step-4'
+      name: 'publishToSonatype closeAndReleaseSonatypeStagingRepository'
       run: './gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository --no-configuration-cache --no-parallel'
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
   plug(plugs.KotlinMulti) apply false
   plug(plugs.KotlinJvm) apply false
   plug(plugs.KotlinMultiCompose) apply false
-  plug(plugs.ComposeJb) apply false
+  plug(plugs.ComposeJb) apply false // ComposeJb(Edge) is very slow to sync, clean, build (jb dev repo issue)
   plug(plugs.AndroLib) apply false
   plug(plugs.AndroApp) apply false
   plug(plugs.NexusPublish)
@@ -27,7 +27,7 @@ defaultBuildTemplateForRootProject(
     name = "USpek",
     description = "Micro tool for testing with syntax similar to Spek, but shorter.",
     githubUrl = "https://github.com/mareklangiewicz/USpek",
-    version = Ver(0, 0, 38),
+    version = Ver(0, 0, 39),
     // https://s01.oss.sonatype.org/content/repositories/releases/pl/mareklangiewicz/uspek/
     // https://github.com/mareklangiewicz/USpek/releases
     settings = LibSettings(

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum