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.

Sign up for GitHub

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

Jump to bottom

Kotlin 1.9.0 #752

Merged
merged 8 commits into from
Jul 19, 2023
Merged

Kotlin 1.9.0 #752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2731e98
Kotlin 1.9.0
SimonMarquis Jul 9, 2023
f7ed381
Add protobuf generated sources to the sourceSets
SimonMarquis May 25, 2023
ba82b06
Fix Lint `RememberReturnType` issue with explicit type
SimonMarquis Jul 9, 2023
bc0a7e6
Update Compose compiler version to 1.5.0
zsmb13 Jul 19, 2023
c64fb89
Upgrade Hilt to 2.47
zsmb13 Jul 19, 2023
05e1656
Update lint to 31.0.2
zsmb13 Jul 19, 2023
3a0ce45
Use newer lint version
dturner Jul 19, 2023
5fa8c1d
Update gradle.properties
SimonMarquis Jul 19, 2023
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
3 changes: 1 addition & 2 deletions app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NiaAppStateTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ class NiaAppStateTest {
@Composable
private fun rememberTestNavController(): TestNavHostController {
val context = LocalContext.current
val navController = remember {
return remember<TestNavHostController> {
TestNavHostController(context).apply {
navigatorProvider.addNavigator(ComposeNavigator())
graph = createGraph(startDestination = "a") {
Expand All @@ -193,5 +193,4 @@ private fun rememberTestNavController(): TestNavHostController {
}
}
}
return navController
}
7 changes: 7 additions & 0 deletions core/datastore/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,13 @@ protobuf {
}
}

androidComponents.beforeVariants {
android.sourceSets.register(it.name) {
java.srcDir(buildDir.resolve("generated/source/proto/${it.name}/java"))
kotlin.srcDir(buildDir.resolve("generated/source/proto/${it.name}/kotlin"))
}
}

dependencies {
implementation(project(":core:common"))
implementation(project(":core:model"))
Expand Down
4 changes: 4 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,7 @@ android.nonTransitiveRClass=true
# https://developer.android.com/build/releases/gradle-plugin#default-changes
android.defaults.buildfeatures.resvalues=false
android.defaults.buildfeatures.shaders=false

# Use newer lint version to support Kotlin 1.9 and corresponding kotlinx-metadata-jvm
# https://googlesamples.github.io/android-custom-lint-rules/usage/newer-lint.md.html
android.experimental.lint.version=8.1.0-rc01
12 changes: 6 additions & 6 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ androidxActivity = "1.7.0"
androidxAppCompat = "1.5.1"
androidxBrowser = "1.4.0"
androidxComposeBom = "2023.06.01"
androidxComposeCompiler = "1.4.8"
androidxComposeCompiler = "1.5.0"
androidxComposeRuntimeTracing = "1.0.0-alpha03"
androidxCore = "1.9.0"
androidxCoreSplashscreen = "1.0.0"
Expand Down Expand Up @@ -34,18 +34,18 @@ firebasePerfPlugin = "1.4.2"
gmsPlugin = "4.3.14"
googleOss = "17.0.1"
googleOssPlugin = "0.10.6"
hilt = "2.46.1"
hilt = "2.47"
hiltExt = "1.0.0"
jacoco = "0.8.7"
junit4 = "4.13.2"
kotlin = "1.8.22"
kotlin = "1.9.0"
kotlinxCoroutines = "1.6.4"
kotlinxDatetime = "0.4.0"
kotlinxSerializationJson = "1.5.1"
ksp = "1.8.22-1.0.11"
lint = "30.3.1"
ksp = "1.9.0-1.0.11"
lint = "31.0.2"
okhttp = "4.10.0"
protobuf = "3.23.0"
protobuf = "3.23.4"
protobufPlugin = "0.9.3"
retrofit = "2.9.0"
retrofitKotlinxSerializationJson = "1.0.0"
Expand Down