From 01dd5a8c111ea031b725c7381526d1265392dd1b Mon Sep 17 00:00:00 2001 From: Konstantin Aksenov Date: Wed, 1 May 2024 10:47:22 +1000 Subject: [PATCH] fix(proxy): missed enable parameter --- buildSrc/src/main/kotlin/Versions.kt | 2 +- github-action/Dockerfile | 2 +- .../kotlin/com/github/vacxe/googleplaycli/PlayStoreApi.kt | 8 ++++++-- .../kotlin/com/github/vacxe/googleplaycli/PlayStoreCli.kt | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 34b2fc4..e956712 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,7 +1,7 @@ object Versions { const val clikt = "2.6.0" const val googleOAuth = "1.13.0" - const val googleAppPublisher = "v3-rev20240328-2.0.0" + const val googleAppPublisher = "v3-rev20240418-2.0.0" const val junit = "4.13" } diff --git a/github-action/Dockerfile b/github-action/Dockerfile index 1a3311a..c389363 100644 --- a/github-action/Dockerfile +++ b/github-action/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/vacxe/google-play-cli:0.4.3 +FROM ghcr.io/vacxe/google-play-cli:0.4.4 COPY entrypoint.sh /entrypoint.sh COPY templates /templates diff --git a/src/main/kotlin/com/github/vacxe/googleplaycli/PlayStoreApi.kt b/src/main/kotlin/com/github/vacxe/googleplaycli/PlayStoreApi.kt index 23ad575..8eb5f59 100644 --- a/src/main/kotlin/com/github/vacxe/googleplaycli/PlayStoreApi.kt +++ b/src/main/kotlin/com/github/vacxe/googleplaycli/PlayStoreApi.kt @@ -38,8 +38,12 @@ class PlayStoreApi(serviceAccountInputStream: InputStream, appName: String) : System.getenv("PLAYSTORE_PROXY")?.run { val proxyParameters = split(":") - System.setProperty("proxyHost", proxyParameters[0]) - System.setProperty("proxyPort", proxyParameters[1]) + val host = proxyParameters[0] + val port = proxyParameters[1] + + System.setProperty("proxySet", "true"); + System.setProperty("proxyHost", host) + System.setProperty("proxyPort", port) } val connectionTimeout = (System.getenv("PLAYSTORE_CONNECTION_TIMEOUT") ?: "PT2M") diff --git a/src/main/kotlin/com/github/vacxe/googleplaycli/PlayStoreCli.kt b/src/main/kotlin/com/github/vacxe/googleplaycli/PlayStoreCli.kt index cb46a96..3e4ecbe 100644 --- a/src/main/kotlin/com/github/vacxe/googleplaycli/PlayStoreCli.kt +++ b/src/main/kotlin/com/github/vacxe/googleplaycli/PlayStoreCli.kt @@ -86,7 +86,7 @@ fun main(args: Array) { addCmd { object : CliktCommand(name = "version", help = "Library version code") { override fun run() { - println("0.4.3") + println("0.4.4") } } }