prepare dev cycle of 1.2.0

robstoll · Nov 1, 2023 · 1ef843d · 1ef843d
1 parent a5a473b
commit 1ef843d
Show file tree

Hide file tree

Showing 7 changed files with 114 additions and 115 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -12,7 +12,7 @@ Following a few guidelines so that others can quickly benefit from your contribu
 
 ## Code of Conduct
 This project and everyone participating in it is governed by Atrium's 
-[Code of Conduct](https://github.com/robstoll/atrium/tree/v1.1.0/.github/CODE_OF_CONDUCT.md). 
+[Code of Conduct](https://github.com/robstoll/atrium/tree/main/.github/CODE_OF_CONDUCT.md). 
 By participating, you are expected to uphold this code. Please report unacceptable behaviour to [email protected]
 
 ## How to Contribute

diff --git a/.github/ISSUE_TEMPLATE/good_first_issue.md b/.github/ISSUE_TEMPLATE/good_first_issue.md
@@ -25,13 +25,13 @@ Following the things you need to do:
 *api-fluent*
 - [ ] provide a val which returns `Expect<T>` in xYExpectations.kt (see yzExpectations.kt as a guideline)
 - [ ] provide a fun which expects an `assertionCreator`-lambda and returns `Expect<AB>` in xyExpectations.kt (see yzExpectations.kt as a guideline)
-- [ ] add `@since 1.1.0` (adapt to current [milestone](https://github.com/robstoll/atrium/milestones)) to KDOC
+- [ ] add `@since 1.2.0` (adapt to current [milestone](https://github.com/robstoll/atrium/milestones)) to KDOC
 - [ ] extend or write a separate Spec named XyExpectationsSpec in specs -> commonMain  (see for instance YzExpectationsSpec) and extend it in atrium-api-fluent -> commonTest
 
 *api-infix*
 - [ ] provide a val which returns `Expect<T>` in xYExpectations.kt(see yzExpectations.kt as a guideline)
 - [ ] provide a fun which expects an `assertionCreator`-lambda and returns `Expect<AB>` in xyExpectations.kt (see yzExpectations.kt as a guideline)
-- [ ] add `@since 1.1.0` (adapt to current [milestone](https://github.com/robstoll/atrium/milestones)) to KDOC
+- [ ] add `@since 1.2.0` (adapt to current [milestone](https://github.com/robstoll/atrium/milestones)) to KDOC
 - [ ] extend or write a separate Spec named XyExpectationsSpec in specs -> commonMain  (see for instance YzExpectationsSpec) and extend it in atrium-api-infix -> commonTest
 
 

diff --git a/README.md b/README.md
diff --git a/apis/differences.md b/apis/differences.md
@@ -19,7 +19,7 @@ The links point to the KDoc of their included API where you find an overview of
 ----
 
 Following an excerpt of a build.gradle file which uses both APIs (see 
-[README#Installation](https://github.com/robstoll/atrium/tree/v1.1.0/README.md#installation)
+[README#Installation](https://github.com/robstoll/atrium/tree/main/README.md#installation)
 for the rest):
 ```kotlin
 dependencies {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,7 @@
 buildscript {
     // needs to be defined in here so that the tutteli publish plugin can set up conventions based on the group
     // (if defined in regular scope of build.gradle.kts then the tutteli plugin would not see it when applied)
-    rootProject.version = "1.1.0"
+    rootProject.version = "1.2.0-SNAPSHOT"
     rootProject.group = "ch.tutteli.atrium"
 }
 
@@ -63,7 +63,7 @@ Release & deploy a commit
 Either use the following commands or the manual steps below
 
 export ATRIUM_PREVIOUS_VERSION=1.1.0
-export ATRIUM_VERSION=1.1.0
+export ATRIUM_VERSION=1.2.0
 find ./ -name "*.md" | xargs perl -0777 -i \
    -pe "s@$ATRIUM_PREVIOUS_VERSION@$ATRIUM_VERSION@g;" \
    -pe "s@tree/main@tree/v$ATRIUM_VERSION@g;" \
@@ -181,7 +181,7 @@ Prepare next dev cycle
 Either use the following commands or the manual steps below
 
 export ATRIUM_VERSION=1.1.0
-export ATRIUM_NEXT_VERSION=1.1.0
+export ATRIUM_NEXT_VERSION=1.2.0
 find ./ -name "*.md" | xargs perl -0777 -i \
    -pe "s@tree/v$ATRIUM_VERSION@tree/main@g;" \
    -pe "s@$ATRIUM_VERSION/doc@latest#/doc@g;" \

diff --git a/gradle/build-logic/dev/src/main/kotlin/build-logic.junit-jacoco-conventions.gradle.kts b/gradle/build-logic/dev/src/main/kotlin/build-logic.junit-jacoco-conventions.gradle.kts
@@ -7,7 +7,6 @@ plugins {
     id("ch.tutteli.gradle.plugins.junitjacoco")
 }
 
-
 dependencies {
     // used to run the samples
     testImplementation("org.junit.jupiter:junit-jupiter-api")

diff --git a/gradle/build-logic/dev/src/main/kotlin/build-logic.kotlin-multiplatform.gradle.kts b/gradle/build-logic/dev/src/main/kotlin/build-logic.kotlin-multiplatform.gradle.kts
@@ -67,7 +67,7 @@ kotlin {
     }
 }
 
-// this is necessary due to some crazy kotlin plugin voodo. If we define this in the rootProject itself,
+// this is necessary due to some crazy kotlin plugin voodoo. If we define this in the rootProject itself,
 // then it does not work.
 rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin> {
     rootProject.configure<org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension> {