Skip to content

Commit ca11586

Browse files
committed
Merge branch 'release/1.3.0.0'
2 parents 88bd795 + 771858f commit ca11586

File tree

21 files changed

+230
-500
lines changed

21 files changed

+230
-500
lines changed

.mvn/wrapper/maven-wrapper.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
# to you under the Apache License, Version 2.0 (the
66
# "License"); you may not use this file except in compliance
77
# with the License. You may obtain a copy of the License at
8-
#
8+
#
99
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
10+
#
1111
# Unless required by applicable law or agreed to in writing,
1212
# software distributed under the License is distributed on an
1313
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.5/apache-maven-3.8.5-bin.zip
18-
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
18+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Extensions that make working with the JVM BDD testing tool [jgiven](https://jgiv
1414
<dependency>
1515
<groupId>io.toolisticon.testing</groupId>
1616
<artifactId>jgiven-kotlin</artifactId>
17-
<version>1.2.4.0</version>
17+
<version>1.3.0.0</version>
1818
<scope>test</scope>
1919
</dependency>
2020

core/pom.xml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<parent>
6+
<groupId>io.toolisticon.testing</groupId>
7+
<artifactId>jgiven-kotlin-parent</artifactId>
8+
<version>1.3.0.0</version>
9+
</parent>
10+
11+
<artifactId>jgiven-kotlin</artifactId>
12+
13+
<name>JGiven Kotlin</name>
14+
<description>jgiven kotlin extension</description>
15+
16+
<dependencies>
17+
<dependency>
18+
<groupId>com.tngtech.jgiven</groupId>
19+
<artifactId>jgiven-core</artifactId>
20+
<scope>provided</scope>
21+
</dependency>
22+
23+
<dependency>
24+
<groupId>org.jetbrains.kotlin</groupId>
25+
<artifactId>kotlin-stdlib-jdk8</artifactId>
26+
</dependency>
27+
28+
<dependency>
29+
<groupId>org.jetbrains.kotlin</groupId>
30+
<artifactId>kotlin-test-junit5</artifactId>
31+
<scope>test</scope>
32+
</dependency>
33+
34+
<dependency>
35+
<groupId>com.tngtech.jgiven</groupId>
36+
<artifactId>jgiven-junit5</artifactId>
37+
<scope>test</scope>
38+
</dependency>
39+
40+
<dependency>
41+
<groupId>org.assertj</groupId>
42+
<artifactId>assertj-core</artifactId>
43+
<version>${assertj.version}</version>
44+
<scope>test</scope>
45+
</dependency>
46+
47+
<dependency>
48+
<groupId>ch.qos.logback</groupId>
49+
<artifactId>logback-classic</artifactId>
50+
<version>1.4.11</version>
51+
<scope>test</scope>
52+
</dependency>
53+
</dependencies>
54+
55+
<build>
56+
<plugins>
57+
<plugin>
58+
<groupId>org.jetbrains.kotlin</groupId>
59+
<artifactId>kotlin-maven-plugin</artifactId>
60+
</plugin>
61+
</plugins>
62+
</build>
63+
</project>
File renamed without changes.

src/test/kotlin/io/toolisticon/testing/jgiven/format/VarargsFormatterTest.kt renamed to core/src/test/kotlin/io/toolisticon/testing/jgiven/format/VarargsFormatterTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,6 @@ internal class VarargsFormatterTest {
7272
}
7373
}
7474

75-
private fun varargInt(vararg v: Int): Any? = v as Any?
76-
private fun varargBoolean(vararg v: Boolean?): Any? = v as Any?
75+
private fun varargInt(vararg v: Int): Any? = v
76+
private fun varargBoolean(vararg v: Boolean?): Any? = v
7777
}

0 commit comments

Comments
 (0)