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

Raise compile sdk level to 34 #2633

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Raise compile sdk level to 34 #2633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2a140fe
Raise compile sdk level to 34
jingtang10 Jul 22, 2024
a11927b
Remove use of kotlin streams
jingtang10 Jul 23, 2024
b309c02
Merge branch 'master' into compile-sdk
jingtang10 Jul 23, 2024
b628756
Upgrade to a device that supports API level 34 for firebase
jingtang10 Jul 24, 2024
b24fbf0
Run spotless apply
jingtang10 Jul 24, 2024
22c72a9
Merge branch 'master' into compile-sdk
jingtang10 Jul 24, 2024
f84e4eb
Add target sdk for datacapture integration tests
jingtang10 Jul 24, 2024
5ed7c12
Merge branch 'master' into compile-sdk
jingtang10 Jul 24, 2024
52a5695
Merge branch 'master' into compile-sdk
jingtang10 Aug 5, 2024
5793a58
Merge branch 'master' into compile-sdk
jingtang10 Sep 3, 2024
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
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/FirebaseTestLabConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2023 Google LLC
* Copyright 2023-2024 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -66,7 +66,7 @@ fun Project.configureFirebaseTestLabForMicroBenchmark() {
devices.set(
listOf(
mapOf(
"model" to "panther",
"model" to "husky",
"version" to "${project.extensions.getByType(LibraryExtension::class.java).compileSdk}",
"locale" to "en_US",
),
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/Sdk.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

object Sdk {
const val COMPILE_SDK = 33
const val COMPILE_SDK = 34
const val TARGET_SDK = 31

// Engine and SDC must support API 24.
Expand Down
5 changes: 4 additions & 1 deletion datacapture/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@ android {
getByName("test").apply { resources.setSrcDirs(listOf("sampledata")) }
}

testOptions { animationsDisabled = true }
testOptions {
animationsDisabled = true
targetSdk = Sdk.TARGET_SDK
}
kotlin { jvmToolchain(11) }
}

Expand Down
9 changes: 3 additions & 6 deletions engine/src/main/java/com/google/android/fhir/testing/Utilities.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ import java.time.Instant
import java.time.OffsetDateTime
import java.util.Date
import java.util.LinkedList
import kotlin.streams.toList
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.flow
Expand Down Expand Up @@ -129,11 +128,9 @@ internal open class TestDownloadManagerImpl(
urls.poll()?.let { DownloadRequest.of(it) }

override suspend fun getSummaryRequestUrls() =
queries
.stream()
.map { ResourceType.fromCode(it.substringBefore("?")) to it.plus("?_summary=count") }
.toList()
.toMap()
queries.associate {
ResourceType.fromCode(it.substringBefore("?")) to it.plus("?_summary=count")
}

override suspend fun processResponse(response: Resource): Collection<Resource> {
val patient = Patient().setMeta(Meta().setLastUpdated(Date()))
Expand Down
Loading