Skip to content

Commit 2443b9d

Browse files
BoDBoD
authored
Bump to 4.0.0-beta.5 and 3.8.3 (#56)
* Bump to 4.0.0-beta.4 * Bump to 4.0.0-beta.5, bump dependencies, and fix transition animations * Bump to Java 17 * Actually use 4.0.0-beta.5 * Bump to 3.8.3
1 parent 2e37061 commit 2443b9d

File tree

19 files changed

+108
-107
lines changed

19 files changed

+108
-107
lines changed

‎.github/workflows/pr.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@v2
16-
- name: set up JDK 11
16+
- name: set up JDK 17
1717
uses: actions/setup-java@v3
1818
with:
1919
distribution: 'temurin'
20-
java-version: 11
20+
java-version: 17
2121
- name: Build current tutorial
2222
working-directory: ./compose/final
2323
run: |

‎compose/final/app/build.gradle.kts‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
plugins {
22
id("com.android.application")
33
id("org.jetbrains.kotlin.android")
4-
id("com.apollographql.apollo3").version("3.8.2")
4+
id("com.apollographql.apollo3").version("3.8.3")
55
}
66

77
android {
88
namespace = "com.example.rocketreserver"
9-
compileSdk = 33
9+
compileSdk = 34
1010

1111
defaultConfig {
1212
applicationId = "com.example.rocketreserver"
1313
minSdk = 24
14-
targetSdk = 33
14+
targetSdk = 34
1515
versionCode = 1
1616
versionName = "1.0"
1717

@@ -41,34 +41,29 @@ android {
4141
compose = true
4242
}
4343
composeOptions {
44-
kotlinCompilerExtensionVersion = "1.4.3"
45-
}
46-
packagingOptions {
47-
resources {
48-
excludes += "/META-INF/{AL2.0,LGPL2.1}"
49-
}
44+
kotlinCompilerExtensionVersion = "1.5.10"
5045
}
5146
}
5247

5348
dependencies {
54-
implementation("androidx.core:core-ktx:1.9.0")
55-
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.0")
56-
implementation("androidx.activity:activity-compose:1.6.1")
57-
implementation(platform("androidx.compose:compose-bom:2023.01.00"))
49+
implementation("androidx.core:core-ktx:1.12.0")
50+
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
51+
implementation("androidx.activity:activity-compose:1.8.2")
52+
implementation(platform("androidx.compose:compose-bom:2024.02.02"))
5853
implementation("androidx.compose.ui:ui")
5954
implementation("androidx.compose.ui:ui-graphics")
6055
implementation("androidx.compose.ui:ui-tooling-preview")
6156
implementation("androidx.compose.material3:material3")
62-
implementation("androidx.navigation:navigation-compose:2.5.3")
63-
implementation("androidx.security:security-crypto:1.1.0-alpha05")
57+
implementation("androidx.navigation:navigation-compose:2.7.7")
58+
implementation("androidx.security:security-crypto:1.1.0-alpha06")
6459
implementation("io.coil-kt:coil-compose:2.2.2")
6560

6661
implementation("com.apollographql.apollo3:apollo-runtime")
6762

6863
testImplementation("junit:junit:4.13.2")
6964
androidTestImplementation("androidx.test.ext:junit:1.1.5")
7065
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
71-
androidTestImplementation(platform("androidx.compose:compose-bom:2022.10.00"))
66+
androidTestImplementation(platform("androidx.compose:compose-bom:2024.02.02"))
7267
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
7368
debugImplementation("androidx.compose.ui:ui-tooling")
7469
debugImplementation("androidx.compose.ui:ui-test-manifest")

‎compose/final/app/src/main/java/com/example/rocketreserver/LaunchDetails.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@ private fun LaunchDetails(
7171
navigateToLogin: () -> Unit,
7272
) {
7373
Column(
74-
modifier = Modifier.padding(16.dp)
74+
modifier = Modifier
75+
.fillMaxSize()
76+
.padding(16.dp)
7577
) {
7678
Row(verticalAlignment = Alignment.CenterVertically) {
7779
// Mission patch

‎compose/final/app/src/main/java/com/example/rocketreserver/LaunchList.kt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ package com.example.rocketreserver
44

55
import androidx.compose.foundation.clickable
66
import androidx.compose.foundation.layout.Box
7+
import androidx.compose.foundation.layout.fillMaxSize
78
import androidx.compose.foundation.layout.fillMaxWidth
89
import androidx.compose.foundation.layout.padding
910
import androidx.compose.foundation.layout.size
@@ -37,8 +38,8 @@ fun LaunchList(onLaunchClick: (launchId: String) -> Unit) {
3738
launchList = launchList + response?.data?.launches?.launches?.filterNotNull().orEmpty()
3839
}
3940

40-
LazyColumn {
41-
items(launchList) { launch ->
41+
LazyColumn(modifier = Modifier.fillMaxSize()) {
42+
items(launchList) { launch ->
4243
LaunchItem(launch = launch, onClick = onLaunchClick)
4344
}
4445

@@ -55,11 +56,11 @@ fun LaunchList(onLaunchClick: (launchId: String) -> Unit) {
5556
private fun LaunchItem(launch: LaunchListQuery.Launch, onClick: (launchId: String) -> Unit) {
5657
ListItem(
5758
modifier = Modifier.clickable { onClick(launch.id) },
58-
headlineText = {
59+
headlineContent = {
5960
// Mission name
6061
Text(text = launch.mission?.name ?: "")
6162
},
62-
supportingText = {
63+
supportingContent = {
6364
// Site
6465
Text(text = launch.site ?: "")
6566
},

‎compose/final/app/src/main/java/com/example/rocketreserver/Login.kt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ package com.example.rocketreserver
44

55
import android.util.Log
66
import androidx.compose.foundation.layout.Column
7+
import androidx.compose.foundation.layout.fillMaxSize
78
import androidx.compose.foundation.layout.fillMaxWidth
89
import androidx.compose.foundation.layout.padding
910
import androidx.compose.foundation.layout.size
@@ -32,7 +33,9 @@ import kotlinx.coroutines.launch
3233
@Composable
3334
fun Login(navigateBack: () -> Unit) {
3435
Column(
35-
modifier = Modifier.padding(16.dp)
36+
modifier = Modifier
37+
.fillMaxSize()
38+
.padding(16.dp)
3639
) {
3740
// Title
3841
Text(

‎compose/final/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
plugins {
3-
id("com.android.application") version "7.4.2" apply false
4-
id("org.jetbrains.kotlin.android") version "1.8.10" apply false
3+
id("com.android.application") version "8.3.0" apply false
4+
id("org.jetbrains.kotlin.android") version "1.9.22" apply false
55
}

‎compose/final/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

‎compose/start/app/build.gradle.kts‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ plugins {
55

66
android {
77
namespace = "com.example.rocketreserver"
8-
compileSdk = 33
8+
compileSdk = 34
99

1010
defaultConfig {
1111
applicationId = "com.example.rocketreserver"
1212
minSdk = 24
13-
targetSdk = 33
13+
targetSdk = 34
1414
versionCode = 1
1515
versionName = "1.0"
1616

@@ -40,32 +40,27 @@ android {
4040
compose = true
4141
}
4242
composeOptions {
43-
kotlinCompilerExtensionVersion = "1.4.3"
44-
}
45-
packagingOptions {
46-
resources {
47-
excludes += "/META-INF/{AL2.0,LGPL2.1}"
48-
}
43+
kotlinCompilerExtensionVersion = "1.5.10"
4944
}
5045
}
5146

5247
dependencies {
53-
implementation("androidx.core:core-ktx:1.9.0")
54-
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.0")
55-
implementation("androidx.activity:activity-compose:1.6.1")
56-
implementation(platform("androidx.compose:compose-bom:2023.01.00"))
48+
implementation("androidx.core:core-ktx:1.12.0")
49+
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
50+
implementation("androidx.activity:activity-compose:1.8.2")
51+
implementation(platform("androidx.compose:compose-bom:2024.02.02"))
5752
implementation("androidx.compose.ui:ui")
5853
implementation("androidx.compose.ui:ui-graphics")
5954
implementation("androidx.compose.ui:ui-tooling-preview")
6055
implementation("androidx.compose.material3:material3")
61-
implementation("androidx.navigation:navigation-compose:2.5.3")
62-
implementation("androidx.security:security-crypto:1.1.0-alpha05")
56+
implementation("androidx.navigation:navigation-compose:2.7.7")
57+
implementation("androidx.security:security-crypto:1.1.0-alpha06")
6358
implementation("io.coil-kt:coil-compose:2.2.2")
6459

6560
testImplementation("junit:junit:4.13.2")
6661
androidTestImplementation("androidx.test.ext:junit:1.1.5")
6762
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
68-
androidTestImplementation(platform("androidx.compose:compose-bom:2022.10.00"))
63+
androidTestImplementation(platform("androidx.compose:compose-bom:2024.02.02"))
6964
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
7065
debugImplementation("androidx.compose.ui:ui-tooling")
7166
debugImplementation("androidx.compose.ui:ui-test-manifest")

‎compose/start/app/src/main/java/com/example/rocketreserver/LaunchDetails.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ import androidx.compose.ui.unit.dp
2424
@Composable
2525
fun LaunchDetails(launchId: String) {
2626
Column(
27-
modifier = Modifier.padding(16.dp)
27+
modifier = Modifier
28+
.fillMaxSize()
29+
.padding(16.dp)
2830
) {
2931
Row(verticalAlignment = Alignment.CenterVertically) {
3032
// Mission patch

‎compose/start/app/src/main/java/com/example/rocketreserver/LaunchList.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package com.example.rocketreserver
55
import androidx.compose.foundation.Image
66
import androidx.compose.foundation.clickable
77
import androidx.compose.foundation.layout.Box
8+
import androidx.compose.foundation.layout.fillMaxSize
89
import androidx.compose.foundation.layout.fillMaxWidth
910
import androidx.compose.foundation.layout.padding
1011
import androidx.compose.foundation.layout.size
@@ -21,7 +22,7 @@ import androidx.compose.ui.unit.dp
2122

2223
@Composable
2324
fun LaunchList(onLaunchClick: (launchId: String) -> Unit) {
24-
LazyColumn {
25+
LazyColumn(modifier = Modifier.fillMaxSize()) {
2526
items(20) {
2627
LaunchItem(launchId = it.toString(), onClick = onLaunchClick)
2728
}
@@ -32,11 +33,11 @@ fun LaunchList(onLaunchClick: (launchId: String) -> Unit) {
3233
private fun LaunchItem(launchId: String, onClick: (launchId: String) -> Unit) {
3334
ListItem(
3435
modifier = Modifier.clickable { onClick(launchId) },
35-
headlineText = {
36+
headlineContent = {
3637
// Mission name
3738
Text(text = "Launch $launchId")
3839
},
39-
supportingText = {
40+
supportingContent = {
4041
// Site
4142
Text(text = "Site...")
4243
},

0 commit comments

Comments
 (0)