Skip to content

Commit 43533d2

Browse files
Yash-GargYash-Garg
committed
chore: bump dependencies and fix deprecated methods
1 parent f308f1b commit 43533d2

File tree

15 files changed

+84
-75
lines changed

15 files changed

+84
-75
lines changed

‎.github/workflows/develop_ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ jobs:
2121
outputs:
2222
any: ${{ steps.changed-files.outputs.any_changed }}
2323
steps:
24-
- uses: actions/checkout@v3.5.2
24+
- uses: actions/checkout@v4.0.0
2525
with:
2626
submodules: "recursive"
2727
fetch-depth: 0
2828
- name: Get changed files
2929
id: changed-files
30-
uses: tj-actions/changed-files@v35.9.2
30+
uses: tj-actions/changed-files@v39.0.0
3131
with:
3232
files: |
3333
.github/workflows/develop_ci.yml
@@ -42,19 +42,19 @@ jobs:
4242
if: needs.file-changes.outputs.any == 'true'
4343
steps:
4444
- name: Checkout repository
45-
uses: actions/checkout@v3.5.2
45+
uses: actions/checkout@v4.0.0
4646
with:
4747
fetch-depth: 0
4848

4949
- name: Set up JDK
50-
uses: actions/setup-java@v3.11.0
50+
uses: actions/setup-java@v3.12.0
5151
with:
5252
distribution: "zulu"
5353
java-version: "17"
5454
cache: "gradle"
5555

5656
- name: Check codestyle
57-
uses: gradle/gradle-build-action@v2.4.2
57+
uses: gradle/gradle-build-action@v2.8.0
5858
with:
5959
arguments: spotlessCheck
6060
gradle-home-cache-cleanup: true
@@ -68,7 +68,7 @@ jobs:
6868
if: needs.file-changes.outputs.any == 'true'
6969
steps:
7070
- name: Checkout repository
71-
uses: actions/checkout@v3.5.2
71+
uses: actions/checkout@v4.0.0
7272
with:
7373
fetch-depth: 0
7474

@@ -81,7 +81,7 @@ jobs:
8181
echo $ENCODED_STRING | base64 --decode > "${TMP_KEYSTORE_FILE_PATH}"/qbit-key.jks
8282
8383
- name: Set up JDK
84-
uses: actions/setup-java@v3.11.0
84+
uses: actions/setup-java@v3.12.0
8585
with:
8686
distribution: "zulu"
8787
java-version: "17"
@@ -92,7 +92,7 @@ jobs:
9292
run: printf 'y\ny\ny\ny\ny\ny\n' | $ANDROID_HOME/tools/bin/sdkmanager --licenses
9393

9494
- name: Build signed APKs
95-
uses: gradle/gradle-build-action@v2.4.2
95+
uses: gradle/gradle-build-action@v2.8.0
9696
with:
9797
arguments: assembleRelease
9898
gradle-home-cache-cleanup: true

‎.github/workflows/pr_ci.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ jobs:
1313
outputs:
1414
any: ${{ steps.changed-files.outputs.any_changed }}
1515
steps:
16-
- uses: actions/checkout@v3.5.2
16+
- uses: actions/checkout@v4.0.0
1717
with:
1818
submodules: 'recursive'
1919
fetch-depth: 0
2020

2121
- name: Get changed files
2222
id: changed-files
23-
uses: tj-actions/changed-files@v35.9.2
23+
uses: tj-actions/changed-files@v39.0.0
2424
with:
2525
files: |
2626
.github/workflows/pr_ci.yml
@@ -41,18 +41,18 @@ jobs:
4141
if: needs.file-changes.outputs.any == 'true'
4242
steps:
4343
- name: Checkout repository
44-
uses: actions/checkout@v3.5.2
44+
uses: actions/checkout@v4.0.0
4545
with:
4646
fetch-depth: 0
4747
- name: Set up JDK
48-
uses: actions/setup-java@v3.11.0
48+
uses: actions/setup-java@v3.12.0
4949
with:
5050
distribution: "zulu"
5151
java-version: "17"
5252
cache: "gradle"
5353

5454
- name: Check codestyle
55-
uses: gradle/gradle-build-action@v2.4.2
55+
uses: gradle/gradle-build-action@v2.8.0
5656
with:
5757
arguments: spotlessCheck
5858
gradle-home-cache-cleanup: true
@@ -63,18 +63,18 @@ jobs:
6363
if: needs.file-changes.outputs.any == 'true'
6464
steps:
6565
- name: Checkout repository
66-
uses: actions/checkout@v3.5.2
66+
uses: actions/checkout@v4.0.0
6767
with:
6868
fetch-depth: 0
6969
- name: Set up JDK
70-
uses: actions/setup-java@v3.11.0
70+
uses: actions/setup-java@v3.12.0
7171
with:
7272
distribution: "zulu"
7373
java-version: "17"
7474
cache: "gradle"
7575

7676
- name: Run lint on debug variants
77-
uses: gradle/gradle-build-action@v2.4.2
77+
uses: gradle/gradle-build-action@v2.8.0
7878
with:
7979
arguments: lintDebug
8080
gradle-home-cache-cleanup: true
@@ -88,18 +88,18 @@ jobs:
8888
if: needs.file-changes.outputs.any == 'true'
8989
steps:
9090
- name: Checkout repository
91-
uses: actions/checkout@v3.5.2
91+
uses: actions/checkout@v4.0.0
9292
with:
9393
fetch-depth: 0
9494
- name: Set up JDK
95-
uses: actions/setup-java@v3.11.0
95+
uses: actions/setup-java@v3.12.0
9696
with:
9797
distribution: "zulu"
9898
java-version: "17"
9999
cache: "gradle"
100100

101101
- name: Build debug APKs
102-
uses: gradle/gradle-build-action@v2.4.2
102+
uses: gradle/gradle-build-action@v2.8.0
103103
with:
104104
arguments: assembleDebug
105105
gradle-home-cache-cleanup: true

‎app/build.gradle.kts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ plugins {
2121

2222
android {
2323
namespace = "dev.yashgarg.qbit"
24-
compileSdk = 33
24+
compileSdk = 34
2525

2626
defaultConfig {
2727
applicationId = "dev.yashgarg.qbit"
2828
minSdk = 24
29-
targetSdk = 33
29+
targetSdk = 34
3030
versionCode = 16
3131
versionName = "v0.2.4-$commitHash"
3232

@@ -36,10 +36,12 @@ android {
3636
}
3737

3838
compileOptions {
39-
sourceCompatibility = JavaVersion.VERSION_11
40-
targetCompatibility = JavaVersion.VERSION_11
39+
sourceCompatibility = JavaVersion.VERSION_17
40+
targetCompatibility = JavaVersion.VERSION_17
4141
}
4242

43+
kotlinOptions { jvmTarget = JavaVersion.VERSION_17.toString() }
44+
4345
val isGithubCi = System.getenv("GITHUB_CI") != null
4446
if (isGithubCi) {
4547
signingConfigs {

‎app/src/main/kotlin/dev/yashgarg/qbit/data/daos/ConfigDao.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ interface ConfigDao {
1212
@Query("SELECT * FROM configs") fun getConfigs(): Flow<List<ServerConfig>>
1313

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

17-
@Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun addConfig(config: ServerConfig)
17+
@Insert(onConflict = OnConflictStrategy.REPLACE) fun addConfig(config: ServerConfig)
1818
}

‎benchmark/build.gradle.kts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,23 @@ plugins {
77

88
android {
99
namespace = "dev.yashgarg.benchmark"
10-
compileSdk = 33
10+
compileSdk = 34
1111

1212
defaultConfig {
13-
minSdk = 24
14-
targetSdk = 33
13+
minSdk = 33
14+
targetSdk = 34
1515

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

2020
compileOptions {
21-
sourceCompatibility = JavaVersion.VERSION_11
22-
targetCompatibility = JavaVersion.VERSION_11
21+
sourceCompatibility = JavaVersion.VERSION_17
22+
targetCompatibility = JavaVersion.VERSION_17
2323
}
2424

25+
kotlinOptions { jvmTarget = JavaVersion.VERSION_17.toString() }
26+
2527
buildTypes {
2628
// This benchmark buildType is used for benchmarking, and should function like your
2729
// release build (for example, with minification on). It"s signed with a debug key

‎benchmark/src/main/java/dev/yashgarg/benchmark/BaselineProfileGenerator.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class BaselineProfileGenerator {
1313

1414
@Test
1515
fun generateBaselineProfile() =
16-
baselineRule.collectBaselineProfile(StartupBenchmark.packageName) {
16+
baselineRule.collect(StartupBenchmark.packageName) {
1717
pressHome()
1818
startActivityAndWait()
1919

‎bonsai-core/build.gradle.kts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@ plugins {
77

88
android {
99
namespace = "cafe.adriel.bonsai.core"
10-
compileSdk = 33
10+
compileSdk = 34
1111

1212
compileOptions {
13-
sourceCompatibility = JavaVersion.VERSION_11
14-
targetCompatibility = JavaVersion.VERSION_11
13+
sourceCompatibility = JavaVersion.VERSION_17
14+
targetCompatibility = JavaVersion.VERSION_17
1515
}
1616

17+
kotlinOptions { jvmTarget = JavaVersion.VERSION_17.toString() }
18+
1719
buildFeatures {
1820
compose = true
1921
composeOptions {

‎build-logic/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ dependencies {
99

1010
afterEvaluate {
1111
tasks.withType<JavaCompile>().configureEach {
12-
sourceCompatibility = JavaVersion.VERSION_11.toString()
13-
targetCompatibility = JavaVersion.VERSION_11.toString()
12+
sourceCompatibility = JavaVersion.VERSION_17.toString()
13+
targetCompatibility = JavaVersion.VERSION_17.toString()
1414
}
1515

1616
tasks.withType<KotlinCompile>().configureEach {
17-
kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() }
17+
kotlinOptions { jvmTarget = JavaVersion.VERSION_17.toString() }
1818
}
1919
}
2020

‎build-logic/src/main/kotlin/dev/yashgarg/qbit/gradle/KotlinCommonPlugin.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ class KotlinCommonPlugin : Plugin<Project> {
1313
override fun apply(project: Project) {
1414
project.tasks.run {
1515
withType<JavaCompile>().configureEach {
16-
sourceCompatibility = JavaVersion.VERSION_11.toString()
17-
targetCompatibility = JavaVersion.VERSION_11.toString()
16+
sourceCompatibility = JavaVersion.VERSION_17.toString()
17+
targetCompatibility = JavaVersion.VERSION_17.toString()
1818
}
1919
withType<KotlinCompile>().configureEach {
20-
kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() }
20+
kotlinOptions { jvmTarget = JavaVersion.VERSION_17.toString() }
2121
}
2222
}
2323
}

‎build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ plugins {
2121
id("dev.yashgarg.qbit.kotlin-common")
2222
}
2323

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

2626
afterEvaluate {
2727
tasks.prepareKotlinBuildScriptModel.dependsOn(tasks.copyGitHooks, tasks.installGitHooks)

0 commit comments

Comments
 (0)