Bump to CfW 1.3.0rc & redux-kotlin 0.6.0-SNAPSHOT

Author: mpetuska

.editorconfig

@@ -1,5 +1,6 @@
 root = true
 
 [*.{kt,kts}]
-indent_size = 2
+indent_size = 4
 ignored_rules = no-wildstar-imports
+insert_final_newline = true

.github/workflows/release.yml

@@ -2,8 +2,8 @@ name: Release
 
 on:
   push:
-    paths-ignore:
-      - '**/*.md'
+    paths:
+      - '**/src/**'
     branches:
       - master
   workflow_dispatch:
@@ -100,6 +100,7 @@ jobs:
       ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
       ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
     strategy:
+      fail-fast: false
       matrix:
         repository:
           - name: Github Packages
@@ -113,10 +114,10 @@ jobs:
         os:
           - runner: ubuntu-latest
             shell: bash
-#          - runner: macos-latest
-#            shell: bash
-#          - runner: windows-latest
-#            shell: msys2 {0}
+    #          - runner: macos-latest
+    #            shell: bash
+    #          - runner: windows-latest
+    #            shell: msys2 {0}
     steps:
       - uses: msys2/setup-msys2@v2
         if: ${{ matrix.repository.enabled == true && runner.os == 'Windows' }}

.github/workflows/resolve-version.yml

@@ -11,7 +11,7 @@ on:
       version:
         value: ${{ jobs.resolve.outputs.version }}
       snapshot:
-        value: ${{ jobs.resolve.outputs.version }}
+        value: ${{ jobs.resolve.outputs.snapshot }}
 
 concurrency:
   cancel-in-progress: true
@@ -58,10 +58,12 @@ jobs:
           SNAPSHOT_VERSION="${main_version}${patch_version}-SNAPSHOT"
           echo "SNAPSHOT_VERSION=$SNAPSHOT_VERSION" >> $GITHUB_ENV
           sed -Ei "s|^(version=).*\$|\\1$SNAPSHOT_VERSION|" gradle.properties
-      - name: Commit and push SNAPSHOT
+      - name: Create Pull Request for new SNAPSHOT
         if: env.DIFF_VERSION == '1' && env.PROJECT_VERSION != env.SNAPSHOT_VERSION
-        uses: devops-infra/action-commit-push@v0.9.2
+        uses: peter-evans/create-pull-request@v4
         with:
-          github_token: ${{ secrets.GH_TOKEN || github.token }}
-          commit_message: '[ci skip] New SNAPSHOT - ${{ env.SNAPSHOT_VERSION }}'
-          target_branch: master
+          title: 'New SNAPSHOT - ${{ env.SNAPSHOT_VERSION }}'
+          commit-message: '[ci skip] New SNAPSHOT - ${{ env.SNAPSHOT_VERSION }}'
+          branch: ci/version/${{ env.SNAPSHOT_VERSION }}
+          delete-branch: true
+          base: master

.gitignore

@@ -6,3 +6,4 @@ build/
 .fleet/
 *.log
 lint.xml
+local.properties

CHANGELOG.md

@@ -0,0 +1,22 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+---
+
+## [Unreleased]
+
+---
+
+## [0.6.0]
+
+Initial release. See [README.md](./README.md) for feature and usage details.
+
+---
+
+[Unreleased]: https://github.com/reduxkotlin/redux-kotlin-compose/compare/0.6.0...HEAD
+
+[0.6.0]: https://github.com/reduxkotlin/redux-kotlin/releases/tag/0.6.0

build-conventions/build.gradle.kts

@@ -1,53 +1,49 @@
-@file:Suppress("OPT_IN_IS_NOT_ENABLED")
-
-import de.fayard.refreshVersions.core.RefreshVersionsCorePlugin
-import de.fayard.refreshVersions.core.internal.InternalRefreshVersionsApi
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-  `kotlin-dsl`
+    `kotlin-dsl`
 }
 
 repositories {
-  gradlePluginPortal()
-  mavenCentral()
-  google()
+    gradlePluginPortal()
+    mavenCentral()
+    google()
+    if (findProperty("project.enableSnapshots") == "true") {
+        maven("https://oss.sonatype.org/content/repositories/snapshots")
+    }
 }
 
 dependencies {
-  implementation("com.android.tools.build:gradle:_")
-  implementation("org.jetbrains.compose:compose-gradle-plugin:_")
-  implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:_")
-  implementation("com.github.jakemarsden:git-hooks-gradle-plugin:_")
-  implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:_")
-  implementation("io.github.gradle-nexus:publish-plugin:_")
-  implementation("org.jetbrains.dokka:dokka-gradle-plugin:_")
-  implementation("dev.petuska:klip-gradle-plugin:_")
-  @OptIn(InternalRefreshVersionsApi::class)
-  implementation("de.fayard.refreshVersions:refreshVersions-core:${RefreshVersionsCorePlugin.currentVersion}")
+    implementation("com.android.tools.build:gradle:_")
+    implementation("org.jetbrains.compose:compose-gradle-plugin:_")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:_")
+    implementation("com.github.jakemarsden:git-hooks-gradle-plugin:_")
+    implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:_")
+    implementation("io.github.gradle-nexus:publish-plugin:_")
+    implementation("org.jetbrains.dokka:dokka-gradle-plugin:_")
 }
 
-gradleEnterprise {
-  buildScan {
-    termsOfServiceUrl = "https://gradle.com/terms-of-service"
-    termsOfServiceAgree = "yes"
-  }
+tasks {
+    withType<KotlinCompile> {
+        kotlinOptions {
+            languageVersion = "1.4" // 1.9 since gradle 8
+        }
+    }
 }
 
-tasks {
-  withType<KotlinCompile> {
-    kotlinOptions {
-      languageVersion = "1.4"
+gradleEnterprise {
+    buildScan {
+        termsOfServiceUrl = "https://gradle.com/terms-of-service"
+        termsOfServiceAgree = "yes"
     }
-  }
 }
 
 kotlin {
-  sourceSets {
-    all {
-      languageSettings {
-        optIn("org.jetbrains.compose.ExperimentalComposeLibrary")
-      }
+    sourceSets {
+        all {
+            languageSettings {
+                optIn("org.jetbrains.compose.ExperimentalComposeLibrary")
+            }
+        }
     }
-  }
 }

build-conventions/settings.gradle.kts

@@ -1,17 +1,17 @@
 pluginManagement {
-  repositories {
-    gradlePluginPortal()
-    mavenCentral()
-    google()
-  }
+    repositories {
+        gradlePluginPortal()
+        mavenCentral()
+        google()
+    }
 }
 
 plugins {
-  id("de.fayard.refreshVersions") version "0.51.0"
-  id("com.gradle.enterprise") version "3.12.2"
+    id("de.fayard.refreshVersions") version "0.51.0"
+    id("com.gradle.enterprise") version "3.12.3"
 }
 
 refreshVersions {
-  versionsPropertiesFile = rootDir.resolve("gradle/versions.properties")
-  extraArtifactVersionKeyRules(rootDir.resolve("gradle/versions.rules"))
+    versionsPropertiesFile = rootDir.resolve("gradle/versions.properties")
+    extraArtifactVersionKeyRules(rootDir.resolve("gradle/versions.rules"))
 }

build-conventions/src/main/kotlin/convention.common.gradle.kts

@@ -1,53 +1,53 @@
 import org.jetbrains.kotlin.konan.target.HostManager
 
 plugins {
-  id("convention.local-properties")
-  id("convention.detekt")
-  idea
+    id("convention.local-properties")
+    id("convention.detekt")
+    idea
 }
 
 repositories {
-  mavenCentral()
-  google()
-  gradlePluginPortal()
-  if (findProperty("project.enableSnapshots") == "true") {
-    maven("https://oss.sonatype.org/content/repositories/snapshots")
-    maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
-  }
+    mavenCentral()
+    google()
+    gradlePluginPortal()
+    if (findProperty("project.enableSnapshots") == "true") {
+        maven("https://oss.sonatype.org/content/repositories/snapshots")
+        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+    }
 }
 
 printlnCI(
-  """
+    """
   CI: $CI
   SANDBOX: $SANDBOX
   isMainHost: $isMainHost
   ---
   hostIsLinux: ${HostManager.hostIsLinux}
   hostIsMac: ${HostManager.hostIsMac}
   hostIsMingw: ${HostManager.hostIsMingw}
-  """.trimIndent()
+    """.trimIndent()
 )
 
 idea {
-  module {
-    isDownloadSources = true
-    isDownloadJavadoc = true
-  }
+    module {
+        isDownloadSources = true
+        isDownloadJavadoc = true
+    }
 }
 
 afterEvaluate {
-  tasks {
-    if (findByName("compile") == null) {
-      register("compile") {
-        dependsOn(withType(AbstractCompile::class))
-        group = "build"
-      }
-    }
-    if (findByName("allTests") == null) {
-      register("allTests") {
-        dependsOn(withType(AbstractTestTask::class))
-        group = "verification"
-      }
+    tasks {
+        if (findByName("compile") == null) {
+            register("compile") {
+                dependsOn(withType(AbstractCompile::class))
+                group = "build"
+            }
+        }
+        if (findByName("allTests") == null) {
+            register("allTests") {
+                dependsOn(withType(AbstractTestTask::class))
+                group = "verification"
+            }
+        }
     }
-  }
 }

build-conventions/src/main/kotlin/convention.compose.gradle.kts

@@ -1,4 +1,4 @@
 plugins {
-  id("convention.common")
-  id("org.jetbrains.compose")
+    id("convention.common")
+    id("org.jetbrains.compose")
 }