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

Update all the dependencies. #59

Merged
merged 1 commit into from
Jul 2, 2023
Merged

Update all the dependencies. #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Update all the dependencies.
  • Loading branch information
@vanniktech
vanniktech committed Jul 2, 2023
commit 4b0fe2ce473a8a7ce505b5f7026fa8170db088d0
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:

strategy:
matrix:
java_version: [11]
java_version: [17]

steps:
- name: Checkout
Expand Down
15 changes: 7 additions & 8 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
buildscript {
ext.kotlin_version = "1.8.22"

repositories {
mavenCentral()
gradlePluginPortal()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
}
}

apply plugin: "kotlin"

kotlin {
jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(11))
}
}

repositories {
mavenCentral()
}
Expand All @@ -22,8 +26,3 @@ dependencies {
testImplementation "junit:junit:4.13.2"
testImplementation "org.assertj:assertj-core:3.24.2"
}

wrapper {
gradleVersion = "8.2"
distributionType = Wrapper.DistributionType.ALL
}
2 changes: 1 addition & 1 deletion src/test/kotlin/com/vanniktech/rxriddles/Riddle14Test.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package com.vanniktech.rxriddles

import com.vanniktech.rxriddles.solutions.Riddle14Solution
import io.reactivex.rxjava3.core.Single
import org.assertj.core.api.Java6Assertions.assertThat
import org.assertj.core.api.Assertions.assertThat
import org.junit.Test
import java.util.concurrent.atomic.AtomicInteger

Expand Down
2 changes: 1 addition & 1 deletion src/test/kotlin/com/vanniktech/rxriddles/Riddle15Test.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package com.vanniktech.rxriddles
import com.vanniktech.rxriddles.solutions.Riddle15Solution
import com.vanniktech.rxriddles.tools.RxRule
import io.reactivex.rxjava3.core.Observable
import org.assertj.core.api.Java6Assertions.assertThat
import org.assertj.core.api.Assertions.assertThat
import org.junit.Rule
import org.junit.Test
import java.util.concurrent.TimeUnit.SECONDS
Expand Down
2 changes: 1 addition & 1 deletion src/test/kotlin/com/vanniktech/rxriddles/Riddle16Test.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package com.vanniktech.rxriddles
import com.vanniktech.rxriddles.solutions.Riddle16Solution
import io.reactivex.rxjava3.subjects.PublishSubject
import io.reactivex.rxjava3.subjects.SingleSubject
import org.assertj.core.api.Java6Assertions.assertThat
import org.assertj.core.api.Assertions.assertThat
import org.junit.Test

/** Solution [Riddle16Solution] */
Expand Down
2 changes: 1 addition & 1 deletion src/test/kotlin/com/vanniktech/rxriddles/Riddle19Test.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package com.vanniktech.rxriddles

import com.vanniktech.rxriddles.Riddle19.Interaction
import com.vanniktech.rxriddles.solutions.Riddle19Solution
import org.assertj.core.api.Java6Assertions.assertThat
import org.assertj.core.api.Assertions.assertThat
import org.junit.Test

/** Solution [Riddle19Solution] */
Expand Down
2 changes: 1 addition & 1 deletion src/test/kotlin/com/vanniktech/rxriddles/Riddle21Test.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package com.vanniktech.rxriddles

import com.vanniktech.rxriddles.solutions.Riddle21Solution
import io.reactivex.rxjava3.core.Observable
import org.assertj.core.api.Java6Assertions.assertThat
import org.assertj.core.api.Assertions.assertThat
import org.junit.Test

/** Solution [Riddle21Solution] */
Expand Down
2 changes: 1 addition & 1 deletion src/test/kotlin/com/vanniktech/rxriddles/Riddle26Test.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import com.vanniktech.rxriddles.solutions.Riddle26Solution
import com.vanniktech.rxriddles.tools.RxRule
import io.reactivex.rxjava3.core.Observable
import io.reactivex.rxjava3.core.Single
import org.assertj.core.api.Java6Assertions.assertThat
import org.assertj.core.api.Assertions.assertThat
import org.junit.Rule
import org.junit.Test
import java.util.concurrent.TimeUnit.MILLISECONDS
Expand Down
2 changes: 1 addition & 1 deletion src/test/kotlin/com/vanniktech/rxriddles/Riddle27Test.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package com.vanniktech.rxriddles

import com.vanniktech.rxriddles.solutions.Riddle27Solution
import io.reactivex.rxjava3.subjects.PublishSubject
import org.assertj.core.api.Java6Assertions.assertThat
import org.assertj.core.api.Assertions.assertThat
import org.junit.Test

/** Solution [Riddle27Solution] */
Expand Down
2 changes: 1 addition & 1 deletion src/test/kotlin/com/vanniktech/rxriddles/Riddle28Test.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package com.vanniktech.rxriddles

import com.vanniktech.rxriddles.solutions.Riddle28Solution
import io.reactivex.rxjava3.subjects.CompletableSubject
import org.assertj.core.api.Java6Assertions.assertThat
import org.assertj.core.api.Assertions.assertThat
import org.junit.Test
import java.util.concurrent.atomic.AtomicInteger

Expand Down
2 changes: 1 addition & 1 deletion src/test/kotlin/com/vanniktech/rxriddles/Riddle29Test.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package com.vanniktech.rxriddles

import com.vanniktech.rxriddles.solutions.Riddle29Solution
import io.reactivex.rxjava3.subjects.MaybeSubject
import org.assertj.core.api.Java6Assertions.assertThat
import org.assertj.core.api.Assertions.assertThat
import org.junit.Test
import java.util.concurrent.atomic.AtomicReference

Expand Down
2 changes: 1 addition & 1 deletion src/test/kotlin/com/vanniktech/rxriddles/Riddle30Test.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package com.vanniktech.rxriddles

import com.vanniktech.rxriddles.solutions.Riddle30Solution
import io.reactivex.rxjava3.subjects.SingleSubject
import org.assertj.core.api.Java6Assertions.assertThat
import org.assertj.core.api.Assertions.assertThat
import org.junit.Test
import java.util.concurrent.atomic.AtomicInteger

Expand Down
2 changes: 1 addition & 1 deletion src/test/kotlin/com/vanniktech/rxriddles/Riddle33Test.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package com.vanniktech.rxriddles
import com.vanniktech.rxriddles.solutions.Riddle33Solution
import io.reactivex.rxjava3.core.Completable
import io.reactivex.rxjava3.schedulers.Schedulers
import org.assertj.core.api.Java6Assertions.assertThat
import org.assertj.core.api.Assertions.assertThat
import org.junit.Test
import java.util.concurrent.Executors

Expand Down
2 changes: 1 addition & 1 deletion src/test/kotlin/com/vanniktech/rxriddles/Riddle34Test.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package com.vanniktech.rxriddles
import com.vanniktech.rxriddles.solutions.Riddle34Solution
import io.reactivex.rxjava3.core.Completable
import io.reactivex.rxjava3.schedulers.Schedulers
import org.assertj.core.api.Java6Assertions.assertThat
import org.assertj.core.api.Assertions.assertThat
import org.junit.Test
import java.util.concurrent.Executors

Expand Down
2 changes: 1 addition & 1 deletion src/test/kotlin/com/vanniktech/rxriddles/Riddle6Test.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package com.vanniktech.rxriddles
import com.vanniktech.rxriddles.solutions.Riddle6Solution
import com.vanniktech.rxriddles.tools.RxRule
import io.reactivex.rxjava3.core.Single
import org.assertj.core.api.Java6Assertions.assertThat
import org.assertj.core.api.Assertions.assertThat
import org.junit.Rule
import org.junit.Test
import java.util.concurrent.TimeUnit.SECONDS
Expand Down
2 changes: 1 addition & 1 deletion src/test/kotlin/com/vanniktech/rxriddles/Riddle8Test.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package com.vanniktech.rxriddles
import com.vanniktech.rxriddles.solutions.Riddle8Solution
import com.vanniktech.rxriddles.tools.RxRule
import io.reactivex.rxjava3.core.Observable
import org.assertj.core.api.Java6Assertions.assertThat
import org.assertj.core.api.Assertions.assertThat
import org.junit.Rule
import org.junit.Test
import java.util.concurrent.TimeUnit.MILLISECONDS
Expand Down