diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts deleted file mode 100644 index cc4bf741..00000000 --- a/buildSrc/build.gradle.kts +++ /dev/null @@ -1,14 +0,0 @@ -plugins { - `kotlin-dsl` -} - -kotlinDslPluginOptions { - experimentalWarning.set(false) -} - -// Required since Gradle 4.10+. -repositories { - jcenter() - maven(url = "https://dl.bintray.com/kotlin/kotlin-eap/") - maven(url = "https://dl.bintray.com/kotlin/kotlin-dev/") -} diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts deleted file mode 100644 index e69de29b..00000000 diff --git a/buildSrc/src/main/kotlin/BuildHelpers.kt b/buildSrc/src/main/kotlin/BuildHelpers.kt deleted file mode 100644 index ea055ff6..00000000 --- a/buildSrc/src/main/kotlin/BuildHelpers.kt +++ /dev/null @@ -1,3 +0,0 @@ -import org.gradle.api.publish.maven.MavenPom - - diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b32a98ba..3e69e9b2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ kotlin = "1.6.0-RC" okhttp = "5.0.0-alpha.2" junit = "5.7.1" -okio = "3.0.0-alpha.10" +okio = "3.0.0" [libraries] kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2b76039e..fbce071a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-rc-2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/test/kotlin/com/baulsupp/okurl/util/TestUtil.kt b/src/test/kotlin/com/baulsupp/okurl/util/TestUtil.kt index c2c485e3..2fe431d9 100644 --- a/src/test/kotlin/com/baulsupp/okurl/util/TestUtil.kt +++ b/src/test/kotlin/com/baulsupp/okurl/util/TestUtil.kt @@ -37,14 +37,12 @@ object TestUtil { } } - @Synchronized suspend fun assumeHasToken( serviceDefinition: ServiceDefinition ) { initialise() - val token = credentialsStore.get(serviceDefinition, - DefaultToken) + val token = credentialsStore.get(serviceDefinition, DefaultToken) assumeTrue(token != null) }