Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dependencies updated #53

Merged
merged 6 commits into from Oct 30, 2023
Merged

Dependencies updated #53

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c892bbc
Dependencies updated
rijnb Oct 30, 2023
cfe9dc2
No RC deps
rijnb Oct 30, 2023
059c827
Removed TODO's
RijnBuve-TomTom Oct 30, 2023
aacf68a
Update extensions/src/test/java/com/tomtom/kotlin/extensions/IfExtens…
RijnBuve-TomTom Oct 30, 2023
f65f236
Removed TODO's
RijnBuve-TomTom Oct 30, 2023
4165eae
Address all the TODOs
OresteSalerno-TomTom Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions README.md
View file
Open in desktop
Expand Up @@ -659,6 +659,10 @@ Contributors: Timon Kanters, Jeroen Erik Jensen, Krzysztof Karczewski

## Release notes

### 1.8.4

* Dependency updates in `pom.xml`. No code changes.

### 1.8.3

* Introduce caching of trace event method annotations in the `Tracer.invoke()` function.
Expand Down
2 changes: 1 addition & 1 deletion extensions/pom.xml
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.tomtom.kotlin</groupId>
<artifactId>kotlin-tools</artifactId>
<version>1.8.3</version>
<version>1.8.4</version>
</parent>

<artifactId>extensions</artifactId>
Expand Down
9 changes: 1 addition & 8 deletions extensions/src/test/java/com/tomtom/kotlin/extensions/IfExtensionsTest.kt
View file
Open in desktop
Expand Up @@ -29,7 +29,6 @@ internal class IfExtensionsTest {
fun `ifTrue on true`() {
// GIVEN
val sut = true
// TODO: replace with `spyk({ 1 })` when https://github.com/mockk/mockk/issues/1033 is fixed.
val ifTrueBlock: () -> Int = spyk {
every { this@spyk.invoke() } answers { 1 }
}
Expand All @@ -46,7 +45,6 @@ internal class IfExtensionsTest {
fun `ifTrue on false`() {
// GIVEN
val sut = false
// TODO: replace with `spyk({ 1 })` when https://github.com/mockk/mockk/issues/1033 is fixed.
val ifTrueBlock: () -> Int = spyk {
every { this@spyk.invoke() } answers { 1 }
}
Expand All @@ -63,7 +61,6 @@ internal class IfExtensionsTest {
fun `ifTrue on null`() {
// GIVEN
val sut: Boolean? = null
// TODO: replace with `spyk({ 1 })` when https://github.com/mockk/mockk/issues/1033 is fixed.
val ifTrueBlock: () -> Int = spyk {
every { this@spyk.invoke() } answers { 1 }
}
Expand Down Expand Up @@ -100,10 +97,7 @@ internal class IfExtensionsTest {
fun `ifNull on null`() {
// GIVEN
val sut: Int? = null
// TODO: replace with `spyk({ 1 })` when https://github.com/mockk/mockk/issues/1033 is fixed.
val ifNullBlock: () -> Int = spyk {
every { this@spyk.invoke() } answers { 1 }
}
val ifNullBlock = spyk({ 1 })

// WHEN
val result = sut.ifNull(ifNullBlock)
Expand All @@ -121,7 +115,6 @@ internal class IfExtensionsTest {
fun `ifNull with different types`() {
// GIVEN
val sut = A
// TODO: replace with `spyk({ B })` when https://github.com/mockk/mockk/issues/1033 is fixed.
val ifNullBlock: () -> Base = spyk {
every { this@spyk.invoke() } answers { B }
}
Expand Down
2 changes: 1 addition & 1 deletion memoization/pom.xml
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.tomtom.kotlin</groupId>
<artifactId>kotlin-tools</artifactId>
<version>1.8.3</version>
<version>1.8.4</version>
</parent>

<artifactId>memoization</artifactId>
Expand Down
27 changes: 14 additions & 13 deletions pom.xml
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@

<groupId>com.tomtom.kotlin</groupId>
<artifactId>kotlin-tools</artifactId>
<version>1.8.3</version>
<version>1.8.4</version>
<packaging>pom</packaging>

<name>Kotlin Tools</name>
Expand Down Expand Up @@ -95,25 +95,26 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<!-- Plugin versions. -->
<dokka-maven-plugin.version>1.8.10</dokka-maven-plugin.version>
<dokka-maven-plugin.version>1.9.10</dokka-maven-plugin.version>
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
<maven-project-info-reports-plugin.version>3.4.2</maven-project-info-reports-plugin.version>
<maven-project-info-reports-plugin.version>3.4.5</maven-project-info-reports-plugin.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
<maven-surefire-plugin.version>3.2.1</maven-surefire-plugin.version>
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>

<!-- Library versions. -->
<equalsverifier.version>3.14</equalsverifier.version>
<equalsverifier.version>3.15.2</equalsverifier.version>
<junit.version>4.13.2</junit.version>
<junit-jupiter.version>5.9.2</junit-jupiter.version>
<kotlin.version>1.8.10</kotlin.version>
<kotlin-test.version>1.8.10</kotlin-test.version>
<kotlin-test-junit.version>1.8.10</kotlin-test-junit.version>
<junit-jupiter.version>5.10.0</junit-jupiter.version>
<kotlin.version>1.9.10</kotlin.version>
<kotlin-test.version>1.9.10</kotlin-test.version>
<kotlin-test-junit.version>1.9.10</kotlin-test-junit.version>
<kotlinx.html.version>0.7.3</kotlinx.html.version>
<kotlinx-coroutines-core.version>1.6.3-native-mt</kotlinx-coroutines-core.version>
<mockito-core.version>5.2.0</mockito-core.version>
<mockk.version>1.13.4</mockk.version>
<kotlinx-coroutines-core.version>1.7.3</kotlinx-coroutines-core.version>
<mockito-core.version>5.6.0</mockito-core.version>
<mockk.version>1.13.7</mockk.version>
<surefire-junit4-plugin.version>3.2.1</surefire-junit4-plugin.version>
</properties>

<distributionManagement>
Expand Down Expand Up @@ -188,7 +189,7 @@
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-junit4</artifactId>
<version>3.1.2</version>
<version>${surefire-junit4-plugin.version}</version>
</dependency>
</dependencies>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion traceevents/pom.xml
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.tomtom.kotlin</groupId>
<artifactId>kotlin-tools</artifactId>
<version>1.8.3</version>
<version>1.8.4</version>
</parent>

<artifactId>traceevents</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion uid/pom.xml
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.tomtom.kotlin</groupId>
<artifactId>kotlin-tools</artifactId>
<version>1.8.3</version>
<version>1.8.4</version>
</parent>

<artifactId>uid</artifactId>
Expand Down