Skip to content
This repository has been archived by the owner on Apr 14, 2024. It is now read-only.

Commit

Permalink
Dependency updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@yschimke
yschimke committed Jan 30, 2022
1 parent 5943303 commit 2c0b1ad
Show file tree
Hide file tree
Showing 122 changed files with 156 additions and 152 deletions.
27 changes: 13 additions & 14 deletions build.gradle.kts
View file
@@ -1,7 +1,6 @@
import net.nemerosa.versioning.ReleaseInfo
import net.nemerosa.versioning.VersionInfo
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.apache.tools.ant.taskdefs.condition.Os
import java.nio.charset.StandardCharsets

@Suppress("DSL_SCOPE_VIOLATION")
Expand All @@ -14,7 +13,7 @@ plugins {
id("net.nemerosa.versioning") version "2.15.1"
id("com.diffplug.spotless") version "5.1.0"
id("com.palantir.graal") version "0.10.0"
id("org.jreleaser") version "0.9.1"
id("org.jreleaser") version "1.0.0-M1"
}

versioning {
Expand Down Expand Up @@ -42,7 +41,7 @@ repositories {
maven {
url = uri("https://jitpack.io")
content {
includeGroup("com.github.yschimke")
includeGroup("com.github.yschimke.schoutput")
}
}
}
Expand Down Expand Up @@ -96,7 +95,7 @@ tasks {
graal {
mainClass("com.baulsupp.okurl.MainKt")
outputName("okurl")
graalVersion("21.3.0")
graalVersion("22.0.0.2")

(javaVersion as Property<String>).set("17")

Expand All @@ -108,7 +107,7 @@ graal {
dependencies {
implementation(platform("com.squareup.okhttp3:okhttp-bom:5.0.0-alpha.2"))

api("com.github.yschimke:oksocial-output:6.5")
api("com.github.yschimke.schoutput:schoutput:0.9.2")
api("com.squareup.moshi:moshi:1.13.0")
api("com.squareup.moshi:moshi-adapters:1.13.0")
api("com.squareup.moshi:moshi-kotlin:1.13.0")
Expand All @@ -128,29 +127,29 @@ dependencies {
implementation("io.jsonwebtoken:jjwt-api:0.11.2")
implementation("io.jsonwebtoken:jjwt-impl:0.11.2")
implementation("io.jsonwebtoken:jjwt-jackson:0.11.2")
implementation("io.zipkin.brave:brave:5.13.5")
implementation("io.zipkin.brave:brave-instrumentation-okhttp3:5.13.5")
implementation("io.zipkin.brave:brave:5.13.7")
implementation("io.zipkin.brave:brave-instrumentation-okhttp3:5.13.7")
implementation("io.zipkin.brave:brave-okhttp:4.13.6")
implementation("io.zipkin.java:zipkin:2.10.1")
implementation("io.zipkin.reporter2:zipkin-sender-okhttp3:2.16.3")
implementation("org.conscrypt:conscrypt-openjdk-uber:2.5.2")
implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.0-RC")
api("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0-RC")
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")
api("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.5.2")
implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.10")
api("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10")
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
api("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.0")
implementation("org.slf4j:slf4j-api:2.0.0-alpha0")
implementation("org.slf4j:slf4j-jdk14:2.0.0-alpha0")
implementation("pt.davidafsilva.apple:jkeychain:1.0.0")
implementation("pt.davidafsilva.apple:jkeychain:1.1.0")
api("com.github.pgreze:kotlin-process:1.3.1")

testImplementation("org.jetbrains.kotlin:kotlin-test:1.6.0-RC")
testImplementation("org.jetbrains.kotlin:kotlin-test:1.6.10")
testImplementation("com.squareup.okhttp3:mockwebserver")
testImplementation("org.conscrypt:conscrypt-openjdk-uber:2.5.2")

testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
testImplementation("org.junit.jupiter:junit-jupiter-engine:5.8.2")

compileOnly("org.graalvm.nativeimage:svm:21.3.0")
compileOnly("org.graalvm.nativeimage:svm:22.0.0.2")
kapt("info.picocli:picocli-codegen:4.6.2")

kapt("com.squareup.moshi:moshi-kotlin-codegen:1.13.0")
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
10 changes: 6 additions & 4 deletions src/main/kotlin/com/baulsupp/okurl/Main.kt
View file
@@ -1,8 +1,5 @@
package com.baulsupp.okurl

import com.baulsupp.oksocial.output.handler.DownloadHandler
import com.baulsupp.oksocial.output.handler.OutputHandler
import com.baulsupp.oksocial.output.UsageException
import com.baulsupp.okurl.Main.Companion.NAME
import com.baulsupp.okurl.apidocs.ServiceApiDocPresenter
import com.baulsupp.okurl.authenticator.AuthInterceptor
Expand All @@ -28,6 +25,9 @@ import com.baulsupp.okurl.sse.handleSseResponse
import com.baulsupp.okurl.util.ClientException
import com.baulsupp.okurl.util.FileContent
import com.baulsupp.okurl.util.HeaderUtil
import com.baulsupp.schoutput.UsageException
import com.baulsupp.schoutput.handler.DownloadHandler
import com.baulsupp.schoutput.handler.OutputHandler
import com.squareup.moshi.Moshi
import kotlinx.coroutines.Deferred
import kotlinx.coroutines.async
Expand All @@ -44,6 +44,8 @@ import okhttp3.RequestBody.Companion.toRequestBody
import okhttp3.Response
import okhttp3.internal.http.StatusLine
import okhttp3.internal.platform.Platform
import okio.FileSystem
import okio.Path.Companion.toOkioPath
import org.conscrypt.Conscrypt
import picocli.CommandLine
import picocli.CommandLine.Command
Expand Down Expand Up @@ -356,7 +358,7 @@ class Main : CommandLineClient() {
}

override fun buildHandler(): OutputHandler<Response> = when {
outputDirectory != null -> DownloadHandler(OkHttpResponseExtractor(), outputDirectory!!)
outputDirectory != null -> DownloadHandler(OkHttpResponseExtractor(), FileSystem.SYSTEM, outputDirectory!!.toOkioPath())
else -> super.buildHandler()
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/baulsupp/okurl/apidocs/ApiDocPresenter.kt
View file
@@ -1,6 +1,6 @@
package com.baulsupp.okurl.apidocs

import com.baulsupp.oksocial.output.handler.OutputHandler
import com.baulsupp.schoutput.handler.OutputHandler
import com.baulsupp.okurl.credentials.Token
import okhttp3.OkHttpClient
import okhttp3.Response
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/baulsupp/okurl/apidocs/ServiceApiDocPresenter.kt
View file
@@ -1,6 +1,6 @@
package com.baulsupp.okurl.apidocs

import com.baulsupp.oksocial.output.handler.OutputHandler
import com.baulsupp.schoutput.handler.OutputHandler
import com.baulsupp.okurl.Main
import com.baulsupp.okurl.authenticator.AuthenticatingInterceptor
import com.baulsupp.okurl.completion.ApiCompleter
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/baulsupp/okurl/authenticator/AuthInterceptor.kt
View file
@@ -1,6 +1,6 @@
package com.baulsupp.okurl.authenticator

import com.baulsupp.oksocial.output.handler.OutputHandler
import com.baulsupp.schoutput.handler.OutputHandler
import com.baulsupp.okurl.apidocs.ApiDocPresenter
import com.baulsupp.okurl.authenticator.authflow.AuthFlow
import com.baulsupp.okurl.completion.ApiCompleter
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/baulsupp/okurl/authenticator/Authorisation.kt
View file
@@ -1,6 +1,6 @@
package com.baulsupp.okurl.authenticator

import com.baulsupp.oksocial.output.UsageException
import com.baulsupp.schoutput.UsageException
import com.baulsupp.okurl.commands.ToolSession
import com.baulsupp.okurl.secrets.Secrets

Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/baulsupp/okurl/authenticator/CompletionOnlyAuthInterceptor.kt
View file
@@ -1,6 +1,6 @@
package com.baulsupp.okurl.authenticator

import com.baulsupp.oksocial.output.handler.OutputHandler
import com.baulsupp.schoutput.handler.OutputHandler
import com.baulsupp.okurl.services.AbstractServiceDefinition
import okhttp3.Interceptor
import okhttp3.OkHttpClient
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/com/baulsupp/okurl/authenticator/Oauth2AuthInterceptor.kt
View file
@@ -1,7 +1,7 @@
package com.baulsupp.okurl.authenticator

import com.baulsupp.oksocial.output.handler.OutputHandler
import com.baulsupp.oksocial.output.UsageException
import com.baulsupp.schoutput.handler.OutputHandler
import com.baulsupp.schoutput.UsageException
import com.baulsupp.okurl.authenticator.oauth2.Oauth2DesktopFlow
import com.baulsupp.okurl.authenticator.oauth2.Oauth2Flow
import com.baulsupp.okurl.authenticator.oauth2.Oauth2Token
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/baulsupp/okurl/authenticator/PrintCredentials.kt
View file
@@ -1,6 +1,6 @@
package com.baulsupp.okurl.authenticator

import com.baulsupp.oksocial.output.handler.OutputHandler
import com.baulsupp.schoutput.handler.OutputHandler
import com.baulsupp.okurl.authenticator.PrintCredentials.Key
import com.baulsupp.okurl.commands.ToolSession
import com.baulsupp.okurl.credentials.CredentialsStore
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/baulsupp/okurl/authenticator/authflow/PromptDesktopFlow.kt
View file
@@ -1,6 +1,6 @@
package com.baulsupp.okurl.authenticator.authflow

import com.baulsupp.oksocial.output.UsageException
import com.baulsupp.schoutput.UsageException
import com.baulsupp.okurl.secrets.Secrets
import okhttp3.OkHttpClient

Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/baulsupp/okurl/authenticator/oauth2/Oauth2DesktopFlow.kt
View file
@@ -1,6 +1,6 @@
package com.baulsupp.okurl.authenticator.oauth2

import com.baulsupp.oksocial.output.handler.OutputHandler
import com.baulsupp.schoutput.handler.OutputHandler
import com.baulsupp.okurl.authenticator.SimpleWebServer
import com.baulsupp.okurl.authenticator.authflow.Callback
import com.baulsupp.okurl.authenticator.authflow.Prompt
Expand Down
15 changes: 9 additions & 6 deletions src/main/kotlin/com/baulsupp/okurl/commands/CommandLineClient.kt
View file
Expand Up @@ -4,10 +4,10 @@ import brave.Tracing
import brave.http.HttpTracing
import brave.propagation.TraceContext
import brave.sampler.Sampler
import com.baulsupp.oksocial.output.UsageException
import com.baulsupp.oksocial.output.handler.ConsoleHandler
import com.baulsupp.oksocial.output.handler.DownloadHandler
import com.baulsupp.oksocial.output.handler.OutputHandler
import com.baulsupp.schoutput.UsageException
import com.baulsupp.schoutput.handler.ConsoleHandler
import com.baulsupp.schoutput.handler.DownloadHandler
import com.baulsupp.schoutput.handler.OutputHandler
import com.baulsupp.okurl.Main
import com.baulsupp.okurl.OkUrl
import com.baulsupp.okurl.authenticator.AuthInterceptor
Expand Down Expand Up @@ -53,6 +53,7 @@ import com.baulsupp.okurl.tracing.ZipkinTracingListener
import com.baulsupp.okurl.util.ClientException
import com.baulsupp.okurl.util.InetAddressParam
import com.baulsupp.okurl.util.LoggingUtil
import com.baulsupp.schoutput.outputHandlerInstance
import com.burgstaller.okhttp.AuthenticationCacheInterceptor
import com.burgstaller.okhttp.CachingAuthenticatorDecorator
import com.burgstaller.okhttp.DispatchingAuthenticator
Expand Down Expand Up @@ -80,6 +81,8 @@ import okhttp3.internal.platform.Platform
import okhttp3.logging.HttpLoggingInterceptor
import okhttp3.logging.LoggingEventListener
import okhttp3.tls.HandshakeCertificates
import okio.FileSystem
import okio.Path.Companion.toPath
import picocli.CommandLine
import picocli.CommandLine.Option
import zipkin2.Span
Expand Down Expand Up @@ -590,8 +593,8 @@ abstract class CommandLineClient : ToolSession, Runnable {

open fun buildHandler(): OutputHandler<Response> {
return when {
rawOutput -> DownloadHandler(OkHttpResponseExtractor(), File("-"))
else -> ConsoleHandler.instance(OkHttpResponseExtractor())
rawOutput -> DownloadHandler(OkHttpResponseExtractor(), FileSystem.Companion.SYSTEM, "-".toPath())
else -> outputHandlerInstance(OkHttpResponseExtractor())
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/baulsupp/okurl/commands/ToolSession.kt
View file
@@ -1,6 +1,6 @@
package com.baulsupp.okurl.commands

import com.baulsupp.oksocial.output.handler.OutputHandler
import com.baulsupp.schoutput.handler.OutputHandler
import com.baulsupp.okurl.credentials.CredentialsStore
import com.baulsupp.okurl.credentials.TokenSet
import com.baulsupp.okurl.location.LocationSource
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/baulsupp/okurl/credentials/CredentialFactory.kt
View file
@@ -1,6 +1,6 @@
package com.baulsupp.okurl.credentials

import com.baulsupp.oksocial.output.isOSX
import com.baulsupp.schoutput.isOSX

object CredentialFactory {
fun createCredentialsStore(): CredentialsStore {
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/baulsupp/okurl/location/BestLocation.kt
View file
@@ -1,6 +1,6 @@
package com.baulsupp.okurl.location

import com.baulsupp.oksocial.output.handler.OutputHandler
import com.baulsupp.schoutput.handler.OutputHandler
import okhttp3.Response

class BestLocation(val outputHandler: OutputHandler<Response>) : LocationSource {
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/com/baulsupp/okurl/location/CoreLocationCLI.kt
View file
@@ -1,7 +1,7 @@
package com.baulsupp.okurl.location

import com.baulsupp.oksocial.output.handler.OutputHandler
import com.baulsupp.oksocial.output.isOSX
import com.baulsupp.schoutput.handler.OutputHandler
import com.baulsupp.schoutput.isOSX
import com.github.pgreze.process.Redirect.CAPTURE
import com.github.pgreze.process.process
import com.github.pgreze.process.unwrap
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/baulsupp/okurl/network/DnsMode.kt
View file
@@ -1,6 +1,6 @@
package com.baulsupp.okurl.network

import com.baulsupp.oksocial.output.UsageException
import com.baulsupp.schoutput.UsageException
import java.util.*

enum class DnsMode {
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/baulsupp/okurl/network/DnsOverride.kt
View file
@@ -1,6 +1,6 @@
package com.baulsupp.okurl.network

import com.baulsupp.oksocial.output.UsageException
import com.baulsupp.schoutput.UsageException
import okhttp3.Dns
import java.net.InetAddress
import java.util.logging.Logger
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/baulsupp/okurl/network/IPvMode.kt
View file
@@ -1,6 +1,6 @@
package com.baulsupp.okurl.network

import com.baulsupp.oksocial.output.UsageException
import com.baulsupp.schoutput.UsageException

enum class IPvMode(val code: String) {
SYSTEM("system"),
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/baulsupp/okurl/okhttp/OkHttpResponseExtractor.kt
View file
@@ -1,6 +1,6 @@
package com.baulsupp.okurl.okhttp

import com.baulsupp.oksocial.output.responses.ResponseExtractor
import com.baulsupp.schoutput.responses.ResponseExtractor
import com.baulsupp.okurl.kotlin.JSON
import okhttp3.Response
import okio.BufferedSource
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/baulsupp/okurl/openapi/OpenApiDocPresenter.kt
View file
@@ -1,6 +1,6 @@
package com.baulsupp.okurl.openapi

import com.baulsupp.oksocial.output.handler.OutputHandler
import com.baulsupp.schoutput.handler.OutputHandler
import com.baulsupp.okurl.apidocs.ApiDocPresenter
import com.baulsupp.okurl.credentials.Token
import com.baulsupp.okurl.kotlin.queryForString
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/com/baulsupp/okurl/secrets/Secrets.kt
View file
@@ -1,7 +1,7 @@
package com.baulsupp.okurl.secrets

import com.baulsupp.oksocial.output.readPasswordString
import com.baulsupp.oksocial.output.readString
import com.baulsupp.schoutput.readPasswordString
import com.baulsupp.schoutput.readString
import com.baulsupp.okurl.util.FileUtil
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/baulsupp/okurl/security/CertificatePin.kt
View file
@@ -1,6 +1,6 @@
package com.baulsupp.okurl.security

import com.baulsupp.oksocial.output.UsageException
import com.baulsupp.schoutput.UsageException
import okhttp3.CertificatePinner

class CertificatePin(patternAndPin: String) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/baulsupp/okurl/services/basicauth/BasicAuthInterceptor.kt
View file
@@ -1,6 +1,6 @@
package com.baulsupp.okurl.services.basicauth

import com.baulsupp.oksocial.output.handler.OutputHandler
import com.baulsupp.schoutput.handler.OutputHandler
import com.baulsupp.okurl.authenticator.AuthInterceptor
import com.baulsupp.okurl.authenticator.BasicCredentials
import com.baulsupp.okurl.completion.CompletionVariableCache
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/baulsupp/okurl/services/box/BoxAuthFlow.kt
View file
@@ -1,6 +1,6 @@
package com.baulsupp.okurl.services.box

import com.baulsupp.oksocial.output.handler.OutputHandler
import com.baulsupp.schoutput.handler.OutputHandler
import com.baulsupp.okurl.authenticator.SimpleWebServer
import com.baulsupp.okurl.authenticator.oauth2.Oauth2Token
import com.baulsupp.okurl.credentials.NoToken
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/baulsupp/okurl/services/box/BoxAuthInterceptor.kt
View file
@@ -1,6 +1,6 @@
package com.baulsupp.okurl.services.box

import com.baulsupp.oksocial.output.handler.OutputHandler
import com.baulsupp.schoutput.handler.OutputHandler
import com.baulsupp.okurl.authenticator.Oauth2AuthInterceptor
import com.baulsupp.okurl.authenticator.ValidatedCredentials
import com.baulsupp.okurl.authenticator.oauth2.Oauth2ServiceDefinition
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/baulsupp/okurl/services/circleci/CircleCIAuthInterceptor.kt
View file
@@ -1,6 +1,6 @@
package com.baulsupp.okurl.services.circleci

import com.baulsupp.oksocial.output.handler.OutputHandler
import com.baulsupp.schoutput.handler.OutputHandler
import com.baulsupp.okurl.authenticator.Oauth2AuthInterceptor
import com.baulsupp.okurl.authenticator.ValidatedCredentials
import com.baulsupp.okurl.authenticator.oauth2.Oauth2ServiceDefinition
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/baulsupp/okurl/services/citymapper/CitymapperAuthInterceptor.kt
View file
@@ -1,6 +1,6 @@
package com.baulsupp.okurl.services.citymapper

import com.baulsupp.oksocial.output.handler.OutputHandler
import com.baulsupp.schoutput.handler.OutputHandler
import com.baulsupp.okurl.authenticator.Oauth2AuthInterceptor
import com.baulsupp.okurl.authenticator.oauth2.Oauth2ServiceDefinition
import com.baulsupp.okurl.authenticator.oauth2.Oauth2Token
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/baulsupp/okurl/services/coinbase/CoinbaseAuthFlow.kt
View file
@@ -1,6 +1,6 @@
package com.baulsupp.okurl.services.coinbase

import com.baulsupp.oksocial.output.handler.OutputHandler
import com.baulsupp.schoutput.handler.OutputHandler
import com.baulsupp.okurl.authenticator.SimpleWebServer
import com.baulsupp.okurl.authenticator.oauth2.Oauth2Token
import com.baulsupp.okurl.kotlin.queryMap
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/baulsupp/okurl/services/coinbase/CoinbaseAuthInterceptor.kt
View file
@@ -1,6 +1,6 @@
package com.baulsupp.okurl.services.coinbase

import com.baulsupp.oksocial.output.handler.OutputHandler
import com.baulsupp.schoutput.handler.OutputHandler
import com.baulsupp.okurl.authenticator.Oauth2AuthInterceptor
import com.baulsupp.okurl.authenticator.ValidatedCredentials
import com.baulsupp.okurl.authenticator.oauth2.Oauth2ServiceDefinition
Expand Down

0 comments on commit 2c0b1ad

Please sign in to comment.