Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update gradle/gradle-build-action action to v2.8.0 - autoclosed #356

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/develop_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ jobs:
outputs:
any: ${{ steps.changed-files.outputs.any_changed }}
steps:
- uses: actions/checkout@v3.5.2
- uses: actions/checkout@v3.6.0
with:
submodules: "recursive"
fetch-depth: 0
- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v35.9.2
uses: tj-actions/changed-files@v35.9.3
with:
files: |
.github/workflows/develop_ci.yml
Expand All @@ -42,7 +42,7 @@ jobs:
if: needs.file-changes.outputs.any == 'true'
steps:
- name: Checkout repository
uses: actions/checkout@v3.5.2
uses: actions/checkout@v3.6.0
with:
fetch-depth: 0

Expand All @@ -54,7 +54,7 @@ jobs:
cache: "gradle"

- name: Check codestyle
uses: gradle/gradle-build-action@v2.4.2
uses: gradle/gradle-build-action@v2.8.0
with:
arguments: spotlessCheck
gradle-home-cache-cleanup: true
Expand All @@ -68,7 +68,7 @@ jobs:
if: needs.file-changes.outputs.any == 'true'
steps:
- name: Checkout repository
uses: actions/checkout@v3.5.2
uses: actions/checkout@v3.6.0
with:
fetch-depth: 0

Expand All @@ -92,7 +92,7 @@ jobs:
run: printf 'y\ny\ny\ny\ny\ny\n' | $ANDROID_HOME/tools/bin/sdkmanager --licenses

- name: Build signed APKs
uses: gradle/gradle-build-action@v2.4.2
uses: gradle/gradle-build-action@v2.8.0
with:
arguments: assembleRelease
gradle-home-cache-cleanup: true
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/pr_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ jobs:
outputs:
any: ${{ steps.changed-files.outputs.any_changed }}
steps:
- uses: actions/checkout@v3.5.2
- uses: actions/checkout@v3.6.0
with:
submodules: 'recursive'
fetch-depth: 0

- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v35.9.2
uses: tj-actions/changed-files@v35.9.3
with:
files: |
.github/workflows/pr_ci.yml
Expand All @@ -41,7 +41,7 @@ jobs:
if: needs.file-changes.outputs.any == 'true'
steps:
- name: Checkout repository
uses: actions/checkout@v3.5.2
uses: actions/checkout@v3.6.0
with:
fetch-depth: 0
- name: Set up JDK
Expand All @@ -52,7 +52,7 @@ jobs:
cache: "gradle"

- name: Check codestyle
uses: gradle/gradle-build-action@v2.4.2
uses: gradle/gradle-build-action@v2.8.0
with:
arguments: spotlessCheck
gradle-home-cache-cleanup: true
Expand All @@ -63,7 +63,7 @@ jobs:
if: needs.file-changes.outputs.any == 'true'
steps:
- name: Checkout repository
uses: actions/checkout@v3.5.2
uses: actions/checkout@v3.6.0
with:
fetch-depth: 0
- name: Set up JDK
Expand All @@ -74,7 +74,7 @@ jobs:
cache: "gradle"

- name: Run lint on debug variants
uses: gradle/gradle-build-action@v2.4.2
uses: gradle/gradle-build-action@v2.8.0
with:
arguments: lintDebug
gradle-home-cache-cleanup: true
Expand All @@ -88,7 +88,7 @@ jobs:
if: needs.file-changes.outputs.any == 'true'
steps:
- name: Checkout repository
uses: actions/checkout@v3.5.2
uses: actions/checkout@v3.6.0
with:
fetch-depth: 0
- name: Set up JDK
Expand All @@ -99,7 +99,7 @@ jobs:
cache: "gradle"

- name: Build debug APKs
uses: gradle/gradle-build-action@v2.4.2
uses: gradle/gradle-build-action@v2.8.0
with:
arguments: assembleDebug
gradle-home-cache-cleanup: true
Expand Down
10 changes: 6 additions & 4 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ plugins {

android {
namespace = "dev.yashgarg.qbit"
compileSdk = 33
compileSdk = 34

defaultConfig {
applicationId = "dev.yashgarg.qbit"
minSdk = 24
targetSdk = 33
targetSdk = 34
versionCode = 16
versionName = "v0.2.4-$commitHash"

Expand All @@ -36,10 +36,12 @@ android {
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions { jvmTarget = JavaVersion.VERSION_17.toString() }

val isGithubCi = System.getenv("GITHUB_CI") != null
if (isGithubCi) {
signingConfigs {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/kotlin/dev/yashgarg/qbit/data/daos/ConfigDao.kt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ interface ConfigDao {
@Query("SELECT * FROM configs") fun getConfigs(): Flow<List<ServerConfig>>

@Query("SELECT * FROM configs WHERE config_id = :index")
suspend fun getConfigAtIndex(index: Int = 0): ServerConfig?
fun getConfigAtIndex(index: Int = 0): ServerConfig?

@Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun addConfig(config: ServerConfig)
@Insert(onConflict = OnConflictStrategy.REPLACE) fun addConfig(config: ServerConfig)
}
12 changes: 7 additions & 5 deletions benchmark/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,23 @@ plugins {

android {
namespace = "dev.yashgarg.benchmark"
compileSdk = 33
compileSdk = 34

defaultConfig {
minSdk = 24
targetSdk = 33
minSdk = 33
targetSdk = 34

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
missingDimensionStrategy("app", "nonFree", "free")
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions { jvmTarget = JavaVersion.VERSION_17.toString() }

buildTypes {
// This benchmark buildType is used for benchmarking, and should function like your
// release build (for example, with minification on). It"s signed with a debug key
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class BaselineProfileGenerator {

@Test
fun generateBaselineProfile() =
baselineRule.collectBaselineProfile(StartupBenchmark.packageName) {
baselineRule.collect(StartupBenchmark.packageName) {
pressHome()
startActivityAndWait()

Expand Down
8 changes: 5 additions & 3 deletions bonsai-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ plugins {

android {
namespace = "cafe.adriel.bonsai.core"
compileSdk = 33
compileSdk = 34

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions { jvmTarget = JavaVersion.VERSION_17.toString() }

buildFeatures {
compose = true
composeOptions {
Expand Down
6 changes: 3 additions & 3 deletions build-logic/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ dependencies {

afterEvaluate {
tasks.withType<JavaCompile>().configureEach {
sourceCompatibility = JavaVersion.VERSION_11.toString()
targetCompatibility = JavaVersion.VERSION_11.toString()
sourceCompatibility = JavaVersion.VERSION_17.toString()
targetCompatibility = JavaVersion.VERSION_17.toString()
}

tasks.withType<KotlinCompile>().configureEach {
kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() }
kotlinOptions { jvmTarget = JavaVersion.VERSION_17.toString() }
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ class KotlinCommonPlugin : Plugin<Project> {
override fun apply(project: Project) {
project.tasks.run {
withType<JavaCompile>().configureEach {
sourceCompatibility = JavaVersion.VERSION_11.toString()
targetCompatibility = JavaVersion.VERSION_11.toString()
sourceCompatibility = JavaVersion.VERSION_17.toString()
targetCompatibility = JavaVersion.VERSION_17.toString()
}
withType<KotlinCompile>().configureEach {
kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() }
kotlinOptions { jvmTarget = JavaVersion.VERSION_17.toString() }
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ plugins {
id("dev.yashgarg.qbit.kotlin-common")
}

val clean by tasks.existing(Delete::class) { delete(rootProject.buildDir) }
val clean by tasks.existing(Delete::class) { delete(rootProject.layout.buildDirectory) }

afterEvaluate {
tasks.prepareKotlinBuildScriptModel.dependsOn(tasks.copyGitHooks, tasks.installGitHooks)
Expand Down
8 changes: 5 additions & 3 deletions common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ plugins {

android {
namespace = "dev.yashgarg.qbit.common"
compileSdk = 33
compileSdk = 34

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions { jvmTarget = JavaVersion.VERSION_17.toString() }

lint { baseline = file("lint-baseline.xml") }
}

Expand Down
37 changes: 18 additions & 19 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,33 +1,32 @@
[versions]
axCore = "1.10.1"
axCore = "1.12.0"
axAppcompat = "1.6.1"
axActivity = "1.7.2"
axConstraintlayout = "2.1.4"
axDatastore = "1.0.0"
axNavigation = "2.6.0"
axTest = "1.4.0"
axNavigation = "2.7.2"
axWork = "2.8.1"
binary_compat = "0.13.2"
coroutines = "1.7.1"
coroutines = "1.7.3"
googleMaterial = "1.9.0"
agp = "8.2.0-alpha07"
agp = "8.2.0-alpha15"
espresso = "3.5.1"
hilt = "2.46.1"
hilt = "2.48"
axHilt = "1.0.0"
ktor = "2.3.1"
lifecycle = "2.6.1"
kotlin = "1.8.21"
mockito = "5.3.1"
room = "2.5.1"
ktor = "2.3.4"
lifecycle = "2.6.2"
kotlin = "1.9.10"
mockito = "5.5.0"
room = "2.5.2"
spotless = "6.19.0"
uiautomator = "2.2.0"
serialization = "1.5.1"
serialization = "1.6.0"

[libraries]
androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "axCore" }
androidx-activity = { module = "androidx.activity:activity-ktx", version.ref = "axActivity" }
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "axAppcompat" }
androidx-benchmark-junit = "androidx.benchmark:benchmark-macro-junit4:1.2.0-alpha15"
androidx-benchmark-junit = "androidx.benchmark:benchmark-macro-junit4:1.2.0-beta05"
androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "axConstraintlayout" }
androidx-datastore = { module = "androidx.datastore:datastore-preferences", version.ref = "axDatastore" }
androidx-swiperefreshlayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
Expand All @@ -53,12 +52,12 @@ build-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.r
coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
coroutines-jdk8 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8", version.ref = "coroutines" }
kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
coroutines-turbine = { module = "app.cash.turbine:turbine", version = "0.13.0" }
coroutines-turbine = { module = "app.cash.turbine:turbine", version = "1.0.0" }

compose-activity = "androidx.activity:activity-compose:1.7.2"
compose-compiler = "androidx.compose.compiler:compiler:1.4.7"
compose-foundation = "androidx.compose.foundation:foundation:1.4.3"
compose-material3 = "androidx.compose.material3:material3:1.1.0"
compose-compiler = "androidx.compose.compiler:compiler:1.5.3"
compose-foundation = "androidx.compose.foundation:foundation:1.5.1"
compose-material3 = "androidx.compose.material3:material3:1.1.1"
compose-material-icons = "org.jetbrains.compose.material:material-icons-extended-desktop:1.4.0"
compose-theme-adapter = "com.google.accompanist:accompanist-themeadapter-material3:0.30.1"

Expand All @@ -76,7 +75,7 @@ ktor-client-contentNegotiation = { module = "io.ktor:ktor-client-content-negotia
ktor-serialization = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }

tools-leakcanary = "com.squareup.leakcanary:leakcanary-android:2.11"
tools-cascade = "me.saket.cascade:cascade:2.0.0"
tools-cascade = "me.saket.cascade:cascade:2.2.0"
tools-kotlin-result = "com.michael-bull.kotlin-result:kotlin-result:1.1.18"
tools-lottie = "com.airbnb.android:lottie:6.0.1"
tools-whatthestack = "com.github.haroldadmin:WhatTheStack:1.0.0-alpha04"
Expand All @@ -97,7 +96,7 @@ kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", versi
multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
navigation-safeargs = { id = "androidx.navigation.safeargs", version.ref = "axNavigation" }
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
sentry = "io.sentry.android.gradle:3.10.0"
sentry = "io.sentry.android.gradle:3.12.0"

[bundles]
compose = ["compose-theme-adapter", "compose-activity", "compose-foundation", "compose-material3"]
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionSha256Sum=591855b517fc635b9e04de1d05d5e76ada3f89f5fc76f87978d1b245b4f69225
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencyResolutionManagement {
}
}

plugins { id("com.gradle.enterprise") version "3.13.3" }
plugins { id("com.gradle.enterprise") version "3.14.1" }

gradleEnterprise {
buildScan {
Expand Down
8 changes: 5 additions & 3 deletions ui-compose/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ plugins {

android {
namespace = "dev.yashgarg.qbit.ui.compose"
compileSdk = 33
compileSdk = 34

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions { jvmTarget = JavaVersion.VERSION_17.toString() }

buildFeatures {
compose = true
composeOptions {
Expand Down