From 558140d18929001b8d2c368c560437ac7330562d Mon Sep 17 00:00:00 2001 From: Carlos Ballesteros Velasco Date: Tue, 13 Feb 2024 12:26:38 +0100 Subject: [PATCH 1/5] Create test.yml --- .github/workflows/test.yml | 67 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..673d908 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,67 @@ +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. +# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle + +name: Test + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + + runs-on: ubuntu-latest + permissions: + contents: read + + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + + # Configure Gradle for optimal use in GiHub Actions, including caching of downloaded dependencies. + # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md + - name: Setup Gradle + uses: gradle/actions/setup-gradle@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3.0.0 + + - name: Build with Gradle Wrapper + run: ./gradlew build + + # NOTE: The Gradle Wrapper is the default and recommended way to run Gradle (https://docs.gradle.org/current/userguide/gradle_wrapper.html). + # If your project does not have the Gradle Wrapper configured, you can use the following configuration to run Gradle with a specified version. + # + # - name: Setup Gradle + # uses: gradle/actions/setup-gradle@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3.0.0 + # with: + # gradle-version: '8.5' + # + # - name: Build with Gradle 8.5 + # run: gradle build + + dependency-submission: + + runs-on: ubuntu-latest + permissions: + contents: write + + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + + # Generates and submits a dependency graph, enabling Dependabot Alerts for all project dependencies. + # See: https://github.com/gradle/actions/blob/main/dependency-submission/README.md + - name: Generate and submit dependency graph + uses: gradle/actions/dependency-submission@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3.0.0 From 592035a7ad4c36e5edf05c56eeeb2bc11890c041 Mon Sep 17 00:00:00 2001 From: soywiz Date: Tue, 13 Feb 2024 12:27:04 +0100 Subject: [PATCH 2/5] Delete .circleci --- .circleci/config.yml | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 696777e..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,28 +0,0 @@ -defaults: &defaults - working_directory: ~/repo - docker: - - image: openjdk:8-jdk - environment: - JVM_OPTS: -Xmx2048m - GRADLE_OPTS: -Xmx1536m -XX:+HeapDumpOnOutOfMemoryError -Dorg.gradle.caching=true -Dorg.gradle.configureondemand=true -Dkotlin.compiler.execution.strategy=in-process -Dkotlin.incremental=false - -version: 2 -jobs: - build: - <<: *defaults - steps: - - checkout - - run: - name: Execute Gradle - command: | - ./gradlew build -x jsIrBrowserTest -x jsLegacyBrowserTest --no-daemon - -workflows: - version: 2 - build: - jobs: - - build: - context: Sonatype - filters: - tags: - only: /.*/ From a822648c5a7a7a671d3fbc0ec7e25c0a07f3b6a9 Mon Sep 17 00:00:00 2001 From: soywiz Date: Tue, 13 Feb 2024 12:29:13 +0100 Subject: [PATCH 3/5] Simplify test.yml --- .github/workflows/test.yml | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 673d908..82fc2ad 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,10 +1,3 @@ -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. -# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time -# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle - name: Test on: @@ -35,33 +28,3 @@ jobs: - name: Build with Gradle Wrapper run: ./gradlew build - - # NOTE: The Gradle Wrapper is the default and recommended way to run Gradle (https://docs.gradle.org/current/userguide/gradle_wrapper.html). - # If your project does not have the Gradle Wrapper configured, you can use the following configuration to run Gradle with a specified version. - # - # - name: Setup Gradle - # uses: gradle/actions/setup-gradle@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3.0.0 - # with: - # gradle-version: '8.5' - # - # - name: Build with Gradle 8.5 - # run: gradle build - - dependency-submission: - - runs-on: ubuntu-latest - permissions: - contents: write - - steps: - - uses: actions/checkout@v4 - - name: Set up JDK 17 - uses: actions/setup-java@v4 - with: - java-version: '17' - distribution: 'temurin' - - # Generates and submits a dependency graph, enabling Dependabot Alerts for all project dependencies. - # See: https://github.com/gradle/actions/blob/main/dependency-submission/README.md - - name: Generate and submit dependency graph - uses: gradle/actions/dependency-submission@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3.0.0 From 8a16274c8649845a5504a51383f36e022c775989 Mon Sep 17 00:00:00 2001 From: soywiz Date: Tue, 13 Feb 2024 12:29:20 +0100 Subject: [PATCH 4/5] Update to 2024.1.0-RELEASE --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 751a57e..403e47c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group=org.hexworks.cobalt -version=2023.1.0-RELEASE +version=2024.1.0-RELEASE kotlin.mpp.stability.nowarn=true kotlin.js.compiler=both From 6fea73f3fae317063078888f5f5fd5133283415a Mon Sep 17 00:00:00 2001 From: soywiz Date: Tue, 13 Feb 2024 12:32:06 +0100 Subject: [PATCH 5/5] Rename optionalName to name --- .../databinding/api/extension/Properties.kt | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/cobalt.core/src/commonMain/kotlin/org/hexworks/cobalt/databinding/api/extension/Properties.kt b/cobalt.core/src/commonMain/kotlin/org/hexworks/cobalt/databinding/api/extension/Properties.kt index 305cb33..d26a71f 100644 --- a/cobalt.core/src/commonMain/kotlin/org/hexworks/cobalt/databinding/api/extension/Properties.kt +++ b/cobalt.core/src/commonMain/kotlin/org/hexworks/cobalt/databinding/api/extension/Properties.kt @@ -28,8 +28,8 @@ import kotlin.jvm.JvmOverloads @JvmOverloads fun T.toProperty( validator: PropertyValidator = { _, _ -> true }, - optionalName: String? = null, -): Property = DefaultProperty(this, optionalName, validator) + name: String? = null, +): Property = DefaultProperty(this, name, validator) // Iterable / Collection @@ -37,64 +37,64 @@ fun T.toProperty( @JvmOverloads fun Iterable.toProperty( validator: PropertyValidator> = { _, _ -> true }, - optionalName: String? = null, -): ListProperty = DefaultListProperty(this.toPersistentList(), optionalName, validator) + name: String? = null, +): ListProperty = DefaultListProperty(this.toPersistentList(), name, validator) @JvmName("toCollectionProperty") @JvmOverloads fun Collection.toProperty( validator: PropertyValidator> = { _, _ -> true }, - optionalName: String? = null, -): ListProperty = DefaultListProperty(this.toPersistentList(), optionalName, validator) + name: String? = null, +): ListProperty = DefaultListProperty(this.toPersistentList(), name, validator) // List @JvmName("toListProperty") @JvmOverloads fun List.toProperty( validator: PropertyValidator> = { _, _ -> true }, - optionalName: String? = null, -): ListProperty = DefaultListProperty(this.toPersistentList(), optionalName, validator) + name: String? = null, +): ListProperty = DefaultListProperty(this.toPersistentList(), name, validator) @JvmName("toPropertyListProperty") @JvmOverloads fun > List.toProperty( validator: PropertyValidator> = { _, _ -> true }, - optionalName: String? = null, -): ListProperty = DefaultPropertyListProperty(this.toPersistentList(), optionalName, validator) + name: String? = null, +): ListProperty = DefaultPropertyListProperty(this.toPersistentList(), name, validator) // Map @JvmName("toMapProperty") @JvmOverloads fun Map.toProperty( validator: PropertyValidator> = { _, _ -> true }, - optionalName: String? = null, -): MapProperty = DefaultMapProperty(this.toPersistentMap(), optionalName, validator) + name: String? = null, +): MapProperty = DefaultMapProperty(this.toPersistentMap(), name, validator) @JvmName("toPropertyMapProperty") @JvmOverloads fun > Map.toProperty( validator: PropertyValidator> = { _, _ -> true }, - optionalName: String? = null, -): MapProperty = DefaultPropertyMapProperty(this.toPersistentMap(), optionalName, validator) + name: String? = null, +): MapProperty = DefaultPropertyMapProperty(this.toPersistentMap(), name, validator) @JvmName("toSetProperty") @JvmOverloads fun Set.toProperty( validator: PropertyValidator> = { _, _ -> true }, - optionalName: String? = null, -): SetProperty = DefaultSetProperty(this.toPersistentSet(), optionalName, validator) + name: String? = null, +): SetProperty = DefaultSetProperty(this.toPersistentSet(), name, validator) @JvmName("toPropertySetProperty") @JvmOverloads fun > Set.toProperty( validator: PropertyValidator> = { _, _ -> true }, - optionalName: String? = null, -): SetProperty = DefaultPropertySetProperty(this.toPersistentSet(), optionalName, validator) + name: String? = null, +): SetProperty = DefaultPropertySetProperty(this.toPersistentSet(), name, validator) /** * Creates a new [InternalProperty] from the given object of type [T]. */ internal fun T.toInternalProperty( validator: PropertyValidator = { _, _ -> true }, - optionalName: String? = null, -): InternalProperty = DefaultProperty(this, optionalName, validator) + name: String? = null, +): InternalProperty = DefaultProperty(this, name, validator)