Skip to content

Commit

Permalink
Bump target SDK to 35, min SDK to 30
Browse files Browse the repository at this point in the history
  • Loading branch information
l2hyunwoo committed Oct 31, 2024
1 parent 504d87b commit b12a6bc
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 13 deletions.
12 changes: 6 additions & 6 deletions baselineprofile/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ plugins {

android {
namespace = "org.sopt.official.baselineprofile"
compileSdk = 34
compileSdk = libs.versions.compileSdk.get().toInt()

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
Expand All @@ -44,8 +44,8 @@ android {
}

defaultConfig {
minSdk = 28
targetSdk = 34
minSdk = libs.versions.minSdk.get().toInt()
targetSdk = libs.versions.targetSdk.get().toInt()

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
Expand All @@ -56,9 +56,9 @@ android {
// To use GMD please invoke generation through the command line:
// ./gradlew :app:generateBaselineProfile
testOptions.managedDevices.devices {
create<ManagedVirtualDevice>("pixel6Api34") {
create<ManagedVirtualDevice>("pixel6Api35") {
device = "Pixel 6"
apiLevel = 34
apiLevel = 35
systemImageSource = "google"
}
}
Expand All @@ -67,7 +67,7 @@ android {
// This is the configuration block for the Baseline Profile plugin.
// You can specify to run the generators on a managed devices or connected devices.
baselineProfile {
managedDevices += "pixel6Api34"
managedDevices += "pixel6Api35"
useConnectedDevices = false
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ import androidx.compose.material3.FabPosition
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableIntStateOf
import androidx.compose.runtime.mutableStateOf
Expand All @@ -64,7 +63,6 @@ import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.DpOffset
import androidx.compose.ui.unit.dp
import androidx.core.content.ContextCompat.startActivity
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.ramcosta.composedestinations.annotation.Destination
Expand Down Expand Up @@ -114,7 +112,6 @@ fun MissionListScreen(

val context = LocalContext.current


resultRecipient.onNavResult { result ->
when (result) {
is NavResult.Canceled -> Unit
Expand All @@ -123,6 +120,7 @@ fun MissionListScreen(
}
}
}

SoptTheme {
when (state) {
MissionsState.Loading -> LoadingScreen()
Expand Down Expand Up @@ -153,7 +151,7 @@ fun MissionListScreen(
WebViewActivity.INTENT_URL,
reportUrl
)
startActivity(context, this, null)
context.startActivity(this)
}
},
onOnboardingButtonClick = { navigator.navigate(OnboardingScreenDestination) }
Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
compileSdk = "34"
minSdk = "28"
targetSdk = "34"
compileSdk = "35"
minSdk = "30"
targetSdk = "35"
appVersion = "2.4.0"
versionCode = "20400"

Expand Down

0 comments on commit b12a6bc

Please sign in to comment.