Skip to content

Commit

Permalink
Update versions
Browse files Browse the repository at this point in the history
  • Loading branch information
Vacxe committed Dec 9, 2022
1 parent af63a05 commit 23ab30e
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 28 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.8
- name: Set up JDK 12
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 12
- name: gradle check
run: ./gradlew check jacocoTestReport
- name: Save test output
Expand All @@ -21,4 +21,4 @@ jobs:
uses: actions/upload-artifact@master
with:
name: test-coverage
path: build/reports/jacoco/test/html
path: build/reports/jacoco/test/html
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.8
- name: Set up JDK 12
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 12
- name: assembleDist
run: ./gradlew distZip distTar
- name: google-play-cli.tar
Expand All @@ -23,4 +23,4 @@ jobs:
uses: actions/upload-artifact@master
with:
name: google-play-cli.zip
path: build/distributions/google-play-cli.zip
path: build/distributions/google-play-cli.zip
12 changes: 1 addition & 11 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,12 @@ dependencies {
implementation(Libraries.clikt)
implementation(Libraries.googleOAuth)
implementation(Libraries.googleAppPublisher)
implementation(kotlin("stdlib-jdk8"))

testImplementation(TestLibraries.junit)
}

val compileKotlin: KotlinCompile by tasks
compileKotlin.kotlinOptions {
jvmTarget = "1.8"
}
val compileTestKotlin: KotlinCompile by tasks
compileTestKotlin.kotlinOptions {
jvmTarget = "1.8"
}

tasks.jacocoTestReport {
reports {
xml.isEnabled = true
}
}
}
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ repositories {
}

dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.21")
}
6 changes: 3 additions & 3 deletions buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
object Versions {
const val clikt = "2.6.0"
const val googleOAuth = "0.4.0"
const val googleAppPublisher = "v3-rev103-1.25.0"
const val googleOAuth = "1.13.0"
const val googleAppPublisher = "v3-rev142-1.25.0"
const val junit = "4.13"
}

Expand All @@ -13,4 +13,4 @@ object Libraries {

object TestLibraries {
const val junit = "junit:junit:${Versions.junit}"
}
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
3 changes: 1 addition & 2 deletions src/main/kotlin/com/github/vacxe/googleplaycli/Commands.kt
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,8 @@ object Commands {
class Update : EditCommand(name = "update") {
private val track: String by option("--track", "-t").required()
private val googleGroups: List<String> by option("--google-group", "-g").multiple()
private val googlePlusCommunities: List<String> by option("--google-plus-communities").multiple()

override fun run(api: PlayStoreApi) = api.testersUpdate(TestersUpdateModel(packageName, editId, track, googleGroups, googlePlusCommunities))
override fun run(api: PlayStoreApi) = api.testersUpdate(TestersUpdateModel(packageName, editId, track, googleGroups))
}

class Patch : EditCommand(name = "patch") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ interface Testers : BaseAction {
val editId = model.editId ?: edits.insert(model.packageName, null).execute().id
val testers = Testers().apply {
googleGroups = model.googleGroups
googlePlusCommunities = model.googlePlusCommunities
}
return edits.testers().update(model.packageName, editId, model.track, testers).execute()
}
Expand All @@ -29,7 +28,6 @@ interface Testers : BaseAction {
val editId = model.editId ?: edits.insert(model.packageName, null).execute().id
val testers = Testers().apply {
model.googleGroups?.let { googleGroups = it }
model.googlePlusCommunities?.let { googlePlusCommunities = it }
}
return edits.testers().update(model.packageName, editId, model.track, testers).execute()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ package com.github.vacxe.googleplaycli.actions.model
class TestersUpdateModel(val packageName: String,
val editId: String?,
val track: String,
val googleGroups: List<String>,
val googlePlusCommunities: List<String>)
val googleGroups: List<String>)

0 comments on commit 23ab30e

Please sign in to comment.