Merge pull request #26 from Vacxe/release-045

Vacxe · web-flow · commit 5451066e77ff · 2024-05-16T12:03:38.000+10:00
feat(release): 0.4.5
diff --git a/github-action/Dockerfile b/github-action/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/vacxe/google-play-cli:0.4.4
+FROM ghcr.io/vacxe/google-play-cli:0.4.5
 
 COPY entrypoint.sh /entrypoint.sh
 COPY templates /templates
diff --git a/src/main/kotlin/com/github/vacxe/googleplaycli/Commands.kt b/src/main/kotlin/com/github/vacxe/googleplaycli/Commands.kt
@@ -712,13 +712,13 @@ object Commands {
         }
     }
 
-    object Internalappsharingartifacts {
+    object InternalAppSharingArtifacts {
         class UploadApk :
             BaseCommand(name = "upload-apk", actionDescription = "Uploads an APK to internal app sharing") {
             private val apk: File by option("--apk", "-a", help = "Apk file path").file().required()
 
-            override fun run(api: PlayStoreApi) = api.internalappsharingartifactsUploadapk(
-                InternalappsharingartifactsUploadapkModel(
+            override fun run(api: PlayStoreApi) = api.internalAppSharingArtifactsUploadApk(
+                InternalAppSharingArtifactsUploadApkModel(
                     packageName,
                     apk,
                     parameters
@@ -727,11 +727,11 @@ object Commands {
         }
 
         class UploadBundle :
-            BaseCommand(name = "upload-bunble", actionDescription = "Uploads an app bundle to internal app sharing") {
+            BaseCommand(name = "upload-bundle", actionDescription = "Uploads an app bundle to internal app sharing") {
             private val bundle: File by option("--bundle", "-b", help = "Bundle file path").file().required()
 
-            override fun run(api: PlayStoreApi) = api.internalappsharingartifactsUploadbundle(
-                InternalappsharingartifactsUploadbundleModel(
+            override fun run(api: PlayStoreApi) = api.internalAppSharingArtifactsUploadBundle(
+                InternalAppSharingArtifactsUploadBundleModel(
                     packageName,
                     bundle,
                     parameters
@@ -769,7 +769,7 @@ object Commands {
             ).required()
 
             override fun run(api: PlayStoreApi) =
-                api.inappproductsDelete(InappproductsDeleteModel(packageName, sku, parameters))
+                api.inAppProductsDelete(InappproductsDeleteModel(packageName, sku, parameters))
         }
 
         class Get :
@@ -781,7 +781,7 @@ object Commands {
             ).required()
 
             override fun run(api: PlayStoreApi) =
-                api.inappproductsGet(InappproductsGetModel(packageName, sku, parameters))
+                api.inAppProductsGet(InappproductsGetModel(packageName, sku, parameters))
         }
 
         class Insert : BaseCommand(name = "insert", actionDescription = "Creates a new in-app product for an app") {
@@ -797,7 +797,7 @@ object Commands {
                         """.trimIndent()
             ).flag()
 
-            override fun run(api: PlayStoreApi) = api.inappproductsInsert(
+            override fun run(api: PlayStoreApi) = api.inAppProductsInsert(
                 InappproductsInsertModel(
                     packageName,
                     jsonPath,
@@ -811,7 +811,7 @@ object Commands {
             name = "list",
             actionDescription = "List all the in-app products for an Android app, both subscriptions and managed in-app products"
         ) {
-            override fun run(api: PlayStoreApi) = api.inappproductsList(DefaultModel(packageName, parameters))
+            override fun run(api: PlayStoreApi) = api.inAppProductsList(DefaultModel(packageName, parameters))
         }
 
         class Patch : BaseCommand(
@@ -835,7 +835,7 @@ object Commands {
                         """.trimIndent()
             ).flag()
 
-            override fun run(api: PlayStoreApi) = api.inappproductsPatch(
+            override fun run(api: PlayStoreApi) = api.inAppProductsPatch(
                 InappproductsPatchModel(
                     packageName,
                     sku,
@@ -864,7 +864,7 @@ object Commands {
                         """.trimIndent()
             ).flag()
 
-            override fun run(api: PlayStoreApi) = api.inappproductsUpdate(
+            override fun run(api: PlayStoreApi) = api.inAppProductsUpdate(
                 InappproductsUpdateModel(
                     packageName,
                     sku,
diff --git a/src/main/kotlin/com/github/vacxe/googleplaycli/PlayStoreApi.kt b/src/main/kotlin/com/github/vacxe/googleplaycli/PlayStoreApi.kt
@@ -3,7 +3,6 @@ package com.github.vacxe.googleplaycli
 import com.github.vacxe.googleplaycli.actions.*
 import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport
 import com.google.api.client.http.HttpRequestInitializer
-import com.google.api.client.json.JsonFactory
 import com.google.api.client.json.gson.GsonFactory
 import com.google.api.services.androidpublisher.AndroidPublisher
 import com.google.api.services.androidpublisher.AndroidPublisherScopes
@@ -15,14 +14,14 @@ import java.time.Duration
 class PlayStoreApi(serviceAccountInputStream: InputStream, appName: String) :
     Apks,
     Bundles,
-    Deobfuscationfiles,
+    DeobfuscationFiles,
     Details,
     DeviceTierConfigs,
     Edit,
     ExpansionFiles,
     Images,
-    Inappproducts,
-    Internalappsharingartifacts,
+    InAppProducts,
+    InternalAppSharingArtifacts,
     Listings,
     Orders,
     Reviews,
diff --git a/src/main/kotlin/com/github/vacxe/googleplaycli/PlayStoreCli.kt b/src/main/kotlin/com/github/vacxe/googleplaycli/PlayStoreCli.kt
@@ -69,13 +69,13 @@ fun main(args: Array<String>) {
             addCmd { Commands.Reviews.Reply() }
         }
         subcmd("internal-app-sharing-artifacts") {
-            addCmd { Commands.Internalappsharingartifacts.UploadApk() }
-            addCmd { Commands.Internalappsharingartifacts.UploadBundle() }
+            addCmd { Commands.InternalAppSharingArtifacts.UploadApk() }
+            addCmd { Commands.InternalAppSharingArtifacts.UploadBundle() }
         }
         subcmd("orders") {
             addCmd { Commands.Orders.Refund() }
         }
-        subcmd("inappproducts") {
+        subcmd("in-app-products") {
             addCmd { Commands.Inappproducts.Delete() }
             addCmd { Commands.Inappproducts.Get() }
             addCmd { Commands.Inappproducts.Insert() }
@@ -86,7 +86,7 @@ fun main(args: Array<String>) {
         addCmd {
             object : CliktCommand(name = "version", help = "Library version code") {
                 override fun run() {
-                    println("0.4.4")
+                    println("0.4.5")
                 }
             }
         }
diff --git a/src/main/kotlin/com/github/vacxe/googleplaycli/actions/DeobfuscationFiles.kt b/src/main/kotlin/com/github/vacxe/googleplaycli/actions/DeobfuscationFiles.kt
@@ -1,14 +1,13 @@
 package com.github.vacxe.googleplaycli.actions
 
 import com.github.vacxe.googleplaycli.actions.model.DeobfuscationfilesUploadModel
-import com.github.vacxe.googleplaycli.core.constants.MediaType.MIME_TYPE_APK
 import com.github.vacxe.googleplaycli.core.constants.MediaType.MIME_TYPE_STREAM
 import com.google.api.client.http.AbstractInputStreamContent
 import com.google.api.client.http.FileContent
 import com.google.api.services.androidpublisher.AndroidPublisher
 import com.google.api.services.androidpublisher.model.DeobfuscationFilesUploadResponse
 
-interface Deobfuscationfiles : BaseAction {
+interface DeobfuscationFiles : BaseAction {
     fun deobfuscationFilesUpload(model: DeobfuscationfilesUploadModel): DeobfuscationFilesUploadResponse {
         val edits: AndroidPublisher.Edits = androidPublisher.edits()
         val editId = model.editId ?: edits.insert(model.packageName, null).execute().id
diff --git a/src/main/kotlin/com/github/vacxe/googleplaycli/actions/InAppProducts.kt b/src/main/kotlin/com/github/vacxe/googleplaycli/actions/InAppProducts.kt
@@ -5,9 +5,9 @@ import com.google.api.services.androidpublisher.model.InAppProduct
 import com.google.api.services.androidpublisher.model.InappproductsListResponse
 import java.nio.file.Files
 
-interface Inappproducts : BaseAction {
+interface InAppProducts : BaseAction {
 
-    fun inappproductsDelete(model: InappproductsDeleteModel): Void {
+    fun inAppProductsDelete(model: InappproductsDeleteModel): Void {
         return androidPublisher
             .inappproducts()
             .delete(model.packageName, model.sku)
@@ -17,7 +17,7 @@ interface Inappproducts : BaseAction {
             .execute()
     }
 
-    fun inappproductsGet(model: InappproductsGetModel): InAppProduct {
+    fun inAppProductsGet(model: InappproductsGetModel): InAppProduct {
         return androidPublisher
             .inappproducts()
             .get(model.packageName, model.sku)
@@ -27,7 +27,7 @@ interface Inappproducts : BaseAction {
             .execute()
     }
 
-    fun inappproductsInsert(model: InappproductsInsertModel): InAppProduct {
+    fun inAppProductsInsert(model: InappproductsInsertModel): InAppProduct {
         val product = Files.newInputStream(model.jsonPath).use {
             androidPublisher.jsonFactory.fromInputStream(it, InAppProduct::class.java)
         }
@@ -42,7 +42,7 @@ interface Inappproducts : BaseAction {
             .execute()
     }
 
-    fun inappproductsList(model: DefaultModel): InappproductsListResponse {
+    fun inAppProductsList(model: DefaultModel): InappproductsListResponse {
         return androidPublisher.inappproducts()
             .list(model.packageName)
             .apply {
@@ -51,7 +51,7 @@ interface Inappproducts : BaseAction {
             .execute()
     }
 
-    fun inappproductsPatch(model: InappproductsPatchModel): InAppProduct {
+    fun inAppProductsPatch(model: InappproductsPatchModel): InAppProduct {
         val product = Files.newInputStream(model.jsonPath).use {
             androidPublisher.jsonFactory.fromInputStream(it, InAppProduct::class.java)
         }
@@ -66,7 +66,7 @@ interface Inappproducts : BaseAction {
             .execute()
     }
 
-    fun inappproductsUpdate(model: InappproductsUpdateModel): InAppProduct {
+    fun inAppProductsUpdate(model: InappproductsUpdateModel): InAppProduct {
         val product = Files.newInputStream(model.jsonPath).use {
             androidPublisher.jsonFactory.fromInputStream(it, InAppProduct::class.java)
         }
@@ -80,5 +80,4 @@ interface Inappproducts : BaseAction {
             }
             .execute()
     }
-
-}
+}
diff --git a/src/main/kotlin/com/github/vacxe/googleplaycli/actions/InternalAppSharingArtifacts.kt b/src/main/kotlin/com/github/vacxe/googleplaycli/actions/InternalAppSharingArtifacts.kt
@@ -1,26 +1,27 @@
 package com.github.vacxe.googleplaycli.actions
 
-import com.github.vacxe.googleplaycli.actions.model.InternalappsharingartifactsUploadapkModel
-import com.github.vacxe.googleplaycli.actions.model.InternalappsharingartifactsUploadbundleModel
+import com.github.vacxe.googleplaycli.actions.model.InternalAppSharingArtifactsUploadApkModel
+import com.github.vacxe.googleplaycli.actions.model.InternalAppSharingArtifactsUploadBundleModel
 import com.github.vacxe.googleplaycli.core.constants.MediaType
 import com.google.api.client.http.AbstractInputStreamContent
 import com.google.api.client.http.FileContent
 import com.google.api.services.androidpublisher.model.InternalAppSharingArtifact
 
-interface Internalappsharingartifacts : BaseAction {
-    fun internalappsharingartifactsUploadapk(model: InternalappsharingartifactsUploadapkModel): InternalAppSharingArtifact {
+interface InternalAppSharingArtifacts : BaseAction {
+    fun internalAppSharingArtifactsUploadApk(model: InternalAppSharingArtifactsUploadApkModel): InternalAppSharingArtifact {
         val apk: AbstractInputStreamContent = FileContent(MediaType.MIME_TYPE_APK, model.apk)
         return androidPublisher
             .internalappsharingartifacts()
             .uploadapk(model.packageName, apk)
+
             .apply {
                 model.parameters.forEach { (key, value) -> set(key, value) }
             }
             .execute()
     }
 
-    fun internalappsharingartifactsUploadbundle(model: InternalappsharingartifactsUploadbundleModel): InternalAppSharingArtifact {
-        val bundle: AbstractInputStreamContent = FileContent(MediaType.MIME_TYPE_APK, model.bundle)
+    fun internalAppSharingArtifactsUploadBundle(model: InternalAppSharingArtifactsUploadBundleModel): InternalAppSharingArtifact {
+        val bundle: AbstractInputStreamContent = FileContent(MediaType.MIME_TYPE_STREAM, model.bundle)
         return androidPublisher
             .internalappsharingartifacts()
             .uploadbundle(model.packageName, bundle)
diff --git a/src/main/kotlin/com/github/vacxe/googleplaycli/actions/model/InternalAppSharingArtifactsUploadApkModel.kt b/src/main/kotlin/com/github/vacxe/googleplaycli/actions/model/InternalAppSharingArtifactsUploadApkModel.kt
@@ -2,7 +2,7 @@ package com.github.vacxe.googleplaycli.actions.model
 
 import java.io.File
 
-class InternalappsharingartifactsUploadapkModel(
+class InternalAppSharingArtifactsUploadApkModel(
     val packageName: String,
     val apk: File,
     requestParameters: String?
diff --git a/src/main/kotlin/com/github/vacxe/googleplaycli/actions/model/InternalAppSharingArtifactsUploadBundleModel.kt b/src/main/kotlin/com/github/vacxe/googleplaycli/actions/model/InternalAppSharingArtifactsUploadBundleModel.kt
@@ -2,7 +2,7 @@ package com.github.vacxe.googleplaycli.actions.model
 
 import java.io.File
 
-class InternalappsharingartifactsUploadbundleModel(
+class InternalAppSharingArtifactsUploadBundleModel(
     val packageName: String,
     val bundle: File,
     requestParameters: String?

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ghcr.io/vacxe/google-play-cli:0.4.4`
	`1`	`+FROM ghcr.io/vacxe/google-play-cli:0.4.5`
`2`	`2`
`3`	`3`	`COPY entrypoint.sh /entrypoint.sh`
`4`	`4`	`COPY templates /templates`
Original file line number	Diff line number	Diff line change
`@@ -69,13 +69,13 @@ fun main(args: Array<String>) {`
`69`	`69`	`addCmd { Commands.Reviews.Reply() }`
`70`	`70`	`}`
`71`	`71`	`subcmd("internal-app-sharing-artifacts") {`
`72`		`- addCmd { Commands.Internalappsharingartifacts.UploadApk() }`
`73`		`- addCmd { Commands.Internalappsharingartifacts.UploadBundle() }`
	`72`	`+ addCmd { Commands.InternalAppSharingArtifacts.UploadApk() }`
	`73`	`+ addCmd { Commands.InternalAppSharingArtifacts.UploadBundle() }`
`74`	`74`	`}`
`75`	`75`	`subcmd("orders") {`
`76`	`76`	`addCmd { Commands.Orders.Refund() }`
`77`	`77`	`}`
`78`		`- subcmd("inappproducts") {`
	`78`	`+ subcmd("in-app-products") {`
`79`	`79`	`addCmd { Commands.Inappproducts.Delete() }`
`80`	`80`	`addCmd { Commands.Inappproducts.Get() }`
`81`	`81`	`addCmd { Commands.Inappproducts.Insert() }`
`@@ -86,7 +86,7 @@ fun main(args: Array<String>) {`
`86`	`86`	`addCmd {`
`87`	`87`	`object : CliktCommand(name = "version", help = "Library version code") {`
`88`	`88`	`override fun run() {`
`89`		`- println("0.4.4")`
	`89`	`+ println("0.4.5")`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@ import com.google.api.services.androidpublisher.model.InAppProduct`
`5`	`5`	`import com.google.api.services.androidpublisher.model.InappproductsListResponse`
`6`	`6`	`import java.nio.file.Files`
`7`	`7`
`8`		`-interface Inappproducts : BaseAction {`
	`8`	`+interface InAppProducts : BaseAction {`
`9`	`9`
`10`		`- fun inappproductsDelete(model: InappproductsDeleteModel): Void {`
	`10`	`+ fun inAppProductsDelete(model: InappproductsDeleteModel): Void {`
`11`	`11`	`return androidPublisher`
`12`	`12`	`.inappproducts()`
`13`	`13`	`.delete(model.packageName, model.sku)`
`@@ -17,7 +17,7 @@ interface Inappproducts : BaseAction {`
`17`	`17`	`.execute()`
`18`	`18`	`}`
`19`	`19`
`20`		`- fun inappproductsGet(model: InappproductsGetModel): InAppProduct {`
	`20`	`+ fun inAppProductsGet(model: InappproductsGetModel): InAppProduct {`
`21`	`21`	`return androidPublisher`
`22`	`22`	`.inappproducts()`
`23`	`23`	`.get(model.packageName, model.sku)`
`@@ -27,7 +27,7 @@ interface Inappproducts : BaseAction {`
`27`	`27`	`.execute()`
`28`	`28`	`}`
`29`	`29`
`30`		`- fun inappproductsInsert(model: InappproductsInsertModel): InAppProduct {`
	`30`	`+ fun inAppProductsInsert(model: InappproductsInsertModel): InAppProduct {`
`31`	`31`	`val product = Files.newInputStream(model.jsonPath).use {`
`32`	`32`	`androidPublisher.jsonFactory.fromInputStream(it, InAppProduct::class.java)`
`33`	`33`	`}`
`@@ -42,7 +42,7 @@ interface Inappproducts : BaseAction {`
`42`	`42`	`.execute()`
`43`	`43`	`}`
`44`	`44`
`45`		`- fun inappproductsList(model: DefaultModel): InappproductsListResponse {`
	`45`	`+ fun inAppProductsList(model: DefaultModel): InappproductsListResponse {`
`46`	`46`	`return androidPublisher.inappproducts()`
`47`	`47`	`.list(model.packageName)`
`48`	`48`	`.apply {`
`@@ -51,7 +51,7 @@ interface Inappproducts : BaseAction {`
`51`	`51`	`.execute()`
`52`	`52`	`}`
`53`	`53`
`54`		`- fun inappproductsPatch(model: InappproductsPatchModel): InAppProduct {`
	`54`	`+ fun inAppProductsPatch(model: InappproductsPatchModel): InAppProduct {`
`55`	`55`	`val product = Files.newInputStream(model.jsonPath).use {`
`56`	`56`	`androidPublisher.jsonFactory.fromInputStream(it, InAppProduct::class.java)`
`57`	`57`	`}`
`@@ -66,7 +66,7 @@ interface Inappproducts : BaseAction {`
`66`	`66`	`.execute()`
`67`	`67`	`}`
`68`	`68`
`69`		`- fun inappproductsUpdate(model: InappproductsUpdateModel): InAppProduct {`
	`69`	`+ fun inAppProductsUpdate(model: InappproductsUpdateModel): InAppProduct {`
`70`	`70`	`val product = Files.newInputStream(model.jsonPath).use {`
`71`	`71`	`androidPublisher.jsonFactory.fromInputStream(it, InAppProduct::class.java)`
`72`	`72`	`}`
`@@ -80,5 +80,4 @@ interface Inappproducts : BaseAction {`
`80`	`80`	`}`
`81`	`81`	`.execute()`
`82`	`82`	`}`
`83`		`-`
`84`		`-}`
	`83`	`+}`