Skip to content

Commit

Permalink
Fix CI before next release (#72)
Browse files Browse the repository at this point in the history
* Reduce the JDK version for spring CI job

* Prepare next snapshot

* Update reamde

* Install local dependency on ci
  • Loading branch information
pedrovgs authored May 2, 2022
1 parent 226e811 commit 640311f
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 32 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ jobs:
with:
java-version: '11'
distribution: 'temurin'
- name: Install dependency
run: ./gradlew install

- name: Test
working-directory: KotlinConsumer
run: ./gradlew test
Expand All @@ -36,6 +39,9 @@ jobs:
with:
java-version: '11'
distribution: 'temurin'
- name: Install dependency
run: ./gradlew install

- name: Test
working-directory: SpringConsumer
env:
Expand All @@ -53,6 +59,8 @@ jobs:
distribution: 'adopt-openj9'
- name: Setup Android SDK
uses: android-actions/setup-android@v2
- name: Install dependency
run: ./gradlew install
- name: Test
working-directory: AndroidConsumer
run: ./gradlew test
Expand Down
2 changes: 1 addition & 1 deletion AndroidConsumer/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
maven { url uri('../../repo') }
}
dependencies {
classpath 'com.karumi.kotlinsnapshot:plugin:2.2.3'
classpath 'com.karumi.kotlinsnapshot:plugin:2.2.4-SNAPSHOT'
}
}

Expand Down
2 changes: 1 addition & 1 deletion KotlinConsumer/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.karumi.kotlinsnapshot:plugin:2.2.3"
classpath "com.karumi.kotlinsnapshot:plugin:2.2.4-SNAPSHOT"
}
}

Expand Down
33 changes: 13 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -161,25 +161,6 @@ class CustomKotlinJsonSerialization: SerializationModule {
}
```

### Changelog

#### 2.2.0 Improve diff coloring:

* User more conventional diff coloring
* Support window line endings replacing '\r\n' to '\n'

#### 2.1.1 Fixed JUnit 5 support:

#### 2.1.0 Improve IntelliJ and JUnit 5 support:

* Support for nullable types.
* Improved IntelliJ Support.
* Add JUnit 5 Support

#### 2.0.0 Improve the serialization format:

* We've replaced the old serialization format with a custom JSON format letting the user review the snapshots easily and unify the format. **If you update the library to a 2.X version or greater you'll have to record all your tests again.**

### Sending your PR

If you would like to contribute code to this repository you can do so through GitHub by creating a new branch in the repository and sending a pull request or opening an issue. Please, remember that there are some requirements you have to pass before accepting your contribution:
Expand All @@ -192,10 +173,22 @@ If you would like to contribute code to this repository you can do so through Gi
* Review if your changes affects the repository documentation and update it.
* Describe the PR content and don't hesitate to add comments to explain us why you've added or changed something.

Developed By
------------

* Pedro Vicente Gómez Sánchez - <[email protected]>

<a href="https://twitter.com/pedro_g_s">
<img alt="Follow me on Twitter" src="https://image.freepik.com/iconos-gratis/twitter-logo_318-40209.jpg" height="60" width="60"/>
</a>
<a href="https://es.linkedin.com/in/pedrovgs">
<img alt="Add me to Linkedin" src="https://image.freepik.com/iconos-gratis/boton-del-logotipo-linkedin_318-84979.png" height="60" width="60"/>
</a>

License
-------

Copyright 2018 Karumi
Copyright 2022 Pedro Vicente Gómez Sánchez

Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
Expand Down
2 changes: 1 addition & 1 deletion SpringConsumer/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ java.sourceCompatibility = JavaVersion.VERSION_11

buildscript {
dependencies {
classpath("com.karumi.kotlinsnapshot:plugin:2.2.3")
classpath("com.karumi.kotlinsnapshot:plugin:2.2.4-SNAPSHOT")
}
repositories {
maven { url = uri("../repo") }
Expand Down
2 changes: 1 addition & 1 deletion core/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
group 'com.karumi.kotlinsnapshot'
version '2.2.3'
version '2.2.4-SNAPSHOT'

buildscript {
ext.kotlin_version = '1.3.21'
Expand Down
4 changes: 2 additions & 2 deletions core/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ POM_NAME=core
POM_ARTIFACT_ID=core
POM_PACKAGING=jar

VERSION_NAME=2.2.3
VERSION_CODE=020203
VERSION_NAME=2.2.4-SNAPSHOT
VERSION_CODE=020204
GROUP=com.karumi.kotlinsnapshot

POM_DESCRIPTION=Snapshot Testing framework for Kotlin
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ POM_NAME=core
POM_ARTIFACT_ID=core
POM_PACKAGING=jar

VERSION_NAME=2.2.3
VERSION_CODE=020203
VERSION_NAME=2.2.4-SNAPSHOT
VERSION_CODE=020204
GROUP=com.karumi.kotlinsnapshot

POM_DESCRIPTION=Snapshot Testing framework for Kotlin
Expand Down
2 changes: 1 addition & 1 deletion plugin/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
group 'com.karumi.kotlinsnapshot'
version '2.2.3'
version '2.2.4-SNAPSHOT'

buildscript {
ext.kotlin_version = '1.3.21'
Expand Down
4 changes: 2 additions & 2 deletions plugin/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ POM_NAME=plugin
POM_ARTIFACT_ID=plugin
POM_PACKAGING=jar

VERSION_NAME=2.2.3
VERSION_CODE=020203
VERSION_NAME=2.2.4-SNAPSHOT
VERSION_CODE=020204
GROUP=com.karumi.kotlinsnapshot

POM_DESCRIPTION=Snapshot Testing framework for Kotlin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ open class KotlinSnapshotPlugin : Plugin<Project> {
project.gradle.addListener(object : DependencyResolutionListener {
override fun beforeResolve(dependencies: ResolvableDependencies) {
val dependency = project.dependencies
.create("com.karumi.kotlinsnapshot:core:2.2.3")
.create("com.karumi.kotlinsnapshot:core:2.2.4-SNAPSHOT")
project.dependencies.add("testImplementation", dependency)
project.gradle.removeListener(this)
}
Expand Down

0 comments on commit 640311f

Please sign in to comment.