chore: upgrade dependencies

zjutjh · Oct 19, 2023 · 0af55eb · 0af55eb
1 parent 67fefa1
commit 0af55eb
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 27 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,12 +7,13 @@ plugins {
 
 android {
     namespace 'com.zjutjh.ijh'
-    compileSdk 34
+    compileSdk compile_sdk
 
     defaultConfig {
         applicationId "com.zjutjh.ijh"
-        minSdk 28
-        targetSdk 33
+        minSdk min_sdk
+        targetSdk target_sdk
+
         versionCode 1
         versionName '0.1.0'
 
@@ -52,7 +53,7 @@ android {
         viewBinding true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.4.7'
+        kotlinCompilerExtensionVersion '1.5.3'
     }
     packagingOptions {
         resources {

diff --git a/app/src/main/kotlin/com/zjutjh/ijh/widget/ScheduleWidget.kt b/app/src/main/kotlin/com/zjutjh/ijh/widget/ScheduleWidget.kt
@@ -35,6 +35,7 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
 
+// TODO: Unfinished yet
 class ScheduleWidget : GlanceAppWidget() {
 
     @EntryPoint

diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle
@@ -5,10 +5,10 @@ plugins {
 
 android {
     namespace = "com.zjutjh.ijh.benchmarks"
-    compileSdk 33
+    compileSdk compile_sdk
 
     defaultConfig {
-        minSdk 28
+        minSdk min_sdk
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/...rks/src/main/kotlin/com/zjutjh/ijh/benchmarks/baselineprofile/BaselineProfileGenerator.kt b/...rks/src/main/kotlin/com/zjutjh/ijh/benchmarks/baselineprofile/BaselineProfileGenerator.kt
@@ -1,21 +1,19 @@
 package com.zjutjh.ijh.benchmarks.baselineprofile
 
-import androidx.benchmark.macro.ExperimentalBaselineProfilesApi
 import androidx.benchmark.macro.junit4.BaselineProfileRule
 import androidx.test.uiautomator.By
 import com.zjutjh.ijh.benchmarks.PACKAGE_NAME
 import org.junit.Rule
 import org.junit.Test
 
-@OptIn(ExperimentalBaselineProfilesApi::class)
 class BaselineProfileGenerator {
 
     @get:Rule
     val baselineRule = BaselineProfileRule()
 
     @Test
-    fun generate() =
-        baselineRule.collectBaselineProfile(PACKAGE_NAME) {
+    fun generate(): Unit =
+        baselineRule.collect(PACKAGE_NAME) {
             pressHome()
             startActivityAndWait()
             with(device) {

diff --git a/build.gradle b/build.gradle
@@ -1,21 +1,25 @@
 buildscript {
     ext {
+        target_sdk = 34
+        compile_sdk = 34
+        min_sdk = 28
+
         lifecycle_version = '2.6.2'
         compose_version = '1.5.4'
         hilt_version = '2.48.1'
         retrofit_version = "2.9.0"
-        accompanist_version = "0.30.1"
+        accompanist_version = "0.32.0"
         protobuf_version = '3.23.4'
         room_version = '2.6.0'
     }
 } // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 plugins {
-    id 'com.android.application' version '8.0.2' apply false
-    id 'com.android.library' version '8.0.2' apply false
-    id 'com.android.test' version '8.0.2' apply false
-    id 'org.jetbrains.kotlin.android' version '1.8.21' apply false
-    id 'com.google.devtools.ksp' version '1.8.21-1.0.11' apply false
+    id 'com.android.application' version '8.2.0-rc01' apply false
+    id 'com.android.library' version '8.2.0-rc01' apply false
+    id 'com.android.test' version '8.2.0-rc01' apply false
+    id 'org.jetbrains.kotlin.android' version '1.9.10' apply false
+    id 'com.google.devtools.ksp' version '1.9.10-1.0.13' apply false
     id 'com.google.dagger.hilt.android' version "$hilt_version" apply false
     id 'com.google.protobuf' version '0.9.4' apply false
     id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin' version '2.0.1' apply false

diff --git a/core/common/build.gradle b/core/common/build.gradle
@@ -2,12 +2,13 @@ plugins {
     id 'com.android.library'
     id 'org.jetbrains.kotlin.android'
 }
+
 android {
     namespace 'com.zjutjh.ijh.common'
-    compileSdk 33
+    compileSdk compile_sdk
 
     defaultConfig {
-        minSdk 28
+        minSdk min_sdk
     }
 
     compileOptions {

diff --git a/core/data/build.gradle b/core/data/build.gradle
@@ -7,10 +7,10 @@ plugins {
 
 android {
     namespace 'com.zjutjh.ijh.data'
-    compileSdk 33
+    compileSdk compile_sdk
 
     defaultConfig {
-        minSdk 28
+        minSdk min_sdk
     }
 
     compileOptions {

diff --git a/core/database/build.gradle b/core/database/build.gradle
@@ -8,10 +8,10 @@ plugins {
 
 android {
     namespace 'com.zjutjh.ijh.database'
-    compileSdk 33
+    compileSdk compile_sdk
 
     defaultConfig {
-        minSdk 28
+        minSdk min_sdk
     }
 
     compileOptions {

diff --git a/core/datastore/build.gradle b/core/datastore/build.gradle
@@ -8,10 +8,10 @@ plugins {
 
 android {
     namespace 'com.zjutjh.ijh.datastore'
-    compileSdk 33
+    compileSdk compile_sdk
 
     defaultConfig {
-        minSdk 28
+        minSdk min_sdk
 
         consumerProguardFiles "consumer-rules.pro"
     }

diff --git a/core/network/build.gradle b/core/network/build.gradle
@@ -9,10 +9,10 @@ plugins {
 
 android {
     namespace 'com.zjutjh.ijh.network'
-    compileSdk 33
+    compileSdk compile_sdk
 
     defaultConfig {
-        minSdk 28
+        minSdk min_sdk
     }
 
     buildTypes {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Apr 28 16:00:17 CST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists