Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 4 additions & 8 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,17 @@ android {
isIncludeAndroidResources = true
}
managedDevices {
devices {
allDevices {
maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel2api30atd").apply {
device = "Pixel 2"
apiLevel = 30
systemImageSource = "aosp-atd"
}
}
devices {
maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel2api30").apply {
device = "Pixel 2"
apiLevel = 30
systemImageSource = "aosp"
}
}
devices {
maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel2api27").apply {
device = "Pixel 2"
apiLevel = 27
Expand All @@ -76,9 +72,9 @@ android {
}
groups {
maybeCreate("api27and30").apply {
targetDevices.add(devices["pixel2api30"])
targetDevices.add(devices["pixel2api30atd"])
targetDevices.add(devices["pixel2api27"])
targetDevices.add(allDevices.getByName("pixel2api30"))
targetDevices.add(allDevices.getByName("pixel2api30atd"))
targetDevices.add(allDevices.getByName("pixel2api27"))
}
}
}
Expand Down
12 changes: 4 additions & 8 deletions core/combine/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,17 @@ android {
}
testOptions {
managedDevices {
devices {
allDevices {
maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel2api30atd").apply {
device = "Pixel 2"
apiLevel = 30
systemImageSource = "aosp-atd"
}
}
devices {
maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel2api30").apply {
device = "Pixel 2"
apiLevel = 30
systemImageSource = "aosp"
}
}
devices {
maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel2api27").apply {
device = "Pixel 2"
apiLevel = 27
Expand All @@ -48,9 +44,9 @@ android {
}
groups {
maybeCreate("api27and30").apply {
targetDevices.add(devices["pixel2api30"])
targetDevices.add(devices["pixel2api30atd"])
targetDevices.add(devices["pixel2api27"])
targetDevices.add(allDevices.getByName("pixel2api30"))
targetDevices.add(allDevices.getByName("pixel2api30atd"))
targetDevices.add(allDevices.getByName("pixel2api27"))
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion core/firebase/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ android {
}
testOptions {
managedDevices {
devices {
allDevices {
maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel2api30atd").apply {
device = "Pixel 2"
apiLevel = 30
Expand Down
12 changes: 4 additions & 8 deletions core/work/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,17 @@ android {
}
testOptions {
managedDevices {
devices {
allDevices {
maybeCreate<ManagedVirtualDevice>("pixel2api30atd").apply {
device = "Pixel 2"
apiLevel = 30
systemImageSource = "aosp-atd"
}
}
devices {
maybeCreate<ManagedVirtualDevice>("pixel2api30").apply {
device = "Pixel 2"
apiLevel = 30
systemImageSource = "aosp"
}
}
devices {
maybeCreate<ManagedVirtualDevice>("pixel2api27").apply {
device = "Pixel 2"
apiLevel = 27
Expand All @@ -49,9 +45,9 @@ android {
}
groups {
maybeCreate("api27and30").apply {
targetDevices.add(devices["pixel2api30"])
targetDevices.add(devices["pixel2api30atd"])
targetDevices.add(devices["pixel2api27"])
targetDevices.add(allDevices.getByName("pixel2api30"))
targetDevices.add(allDevices.getByName("pixel2api30atd"))
targetDevices.add(allDevices.getByName("pixel2api27"))
}
}
}
Expand Down
20 changes: 9 additions & 11 deletions data/api/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import com.android.build.api.dsl.ManagedVirtualDevice
import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
import org.gradle.kotlin.dsl.maybeCreate
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
Expand Down Expand Up @@ -32,32 +34,28 @@ android {
isReturnDefaultValues = true
}
managedDevices {
devices {
maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel2api30atd").apply {
allDevices {
maybeCreate<ManagedVirtualDevice>("pixel2api30atd").apply {
device = "Pixel 2"
apiLevel = 30
systemImageSource = "aosp-atd"
}
}
devices {
maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel2api30").apply {
maybeCreate<ManagedVirtualDevice>("pixel2api30").apply {
device = "Pixel 2"
apiLevel = 30
systemImageSource = "aosp"
}
}
devices {
maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel2api27").apply {
maybeCreate<ManagedVirtualDevice>("pixel2api27").apply {
device = "Pixel 2"
apiLevel = 27
systemImageSource = "aosp"
}
}
groups {
maybeCreate("api27and30").apply {
targetDevices.add(devices["pixel2api30"])
targetDevices.add(devices["pixel2api30atd"])
targetDevices.add(devices["pixel2api27"])
targetDevices.add(allDevices.getByName("pixel2api30"))
targetDevices.add(allDevices.getByName("pixel2api30atd"))
targetDevices.add(allDevices.getByName("pixel2api27"))
}
}
}
Expand Down
20 changes: 9 additions & 11 deletions data/meal/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import com.android.build.api.dsl.ManagedVirtualDevice
import org.gradle.kotlin.dsl.maybeCreate
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
Expand All @@ -23,32 +25,28 @@ android {
}
testOptions {
managedDevices {
devices {
maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel2api30atd").apply {
allDevices {
maybeCreate<ManagedVirtualDevice>("pixel2api30atd").apply {
device = "Pixel 2"
apiLevel = 30
systemImageSource = "aosp-atd"
}
}
devices {
maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel2api30").apply {
maybeCreate<ManagedVirtualDevice>("pixel2api30").apply {
device = "Pixel 2"
apiLevel = 30
systemImageSource = "aosp"
}
}
devices {
maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel2api27").apply {
maybeCreate<ManagedVirtualDevice>("pixel2api27").apply {
device = "Pixel 2"
apiLevel = 27
systemImageSource = "aosp"
}
}
groups {
maybeCreate("api27and30").apply {
targetDevices.add(devices["pixel2api30"])
targetDevices.add(devices["pixel2api30atd"])
targetDevices.add(devices["pixel2api27"])
targetDevices.add(allDevices.getByName("pixel2api30"))
targetDevices.add(allDevices.getByName("pixel2api30atd"))
targetDevices.add(allDevices.getByName("pixel2api27"))
}
}
}
Expand Down
13 changes: 6 additions & 7 deletions data/memo/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import com.android.build.api.dsl.ManagedVirtualDevice
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
Expand Down Expand Up @@ -25,24 +26,22 @@ android {
}
testOptions {
managedDevices {
devices {
maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel2api30atd").apply {
allDevices {
maybeCreate<ManagedVirtualDevice>("pixel2api30atd").apply {
device = "Pixel 2"
apiLevel = 30
systemImageSource = "aosp-atd"
}
}
devices {
maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel2api27").apply {
maybeCreate<ManagedVirtualDevice>("pixel2api27").apply {
device = "Pixel 2"
apiLevel = 27
systemImageSource = "aosp"
}
}
groups {
maybeCreate("api27and30").apply {
targetDevices.add(devices["pixel2api30atd"])
targetDevices.add(devices["pixel2api27"])
targetDevices.add(allDevices.getByName("pixel2api30atd"))
targetDevices.add(allDevices.getByName("pixel2api27"))
}
}
}
Expand Down
20 changes: 9 additions & 11 deletions data/preferences/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import com.android.build.api.dsl.ManagedVirtualDevice
import org.gradle.kotlin.dsl.maybeCreate
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
Expand All @@ -18,32 +20,28 @@ android {
}
testOptions {
managedDevices {
devices {
maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel2api30atd").apply {
allDevices {
maybeCreate<ManagedVirtualDevice>("pixel2api30atd").apply {
device = "Pixel 2"
apiLevel = 30
systemImageSource = "aosp-atd"
}
}
devices {
maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel2api30").apply {
maybeCreate<ManagedVirtualDevice>("pixel2api30").apply {
device = "Pixel 2"
apiLevel = 30
systemImageSource = "aosp"
}
}
devices {
maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel2api27").apply {
maybeCreate<ManagedVirtualDevice>("pixel2api27").apply {
device = "Pixel 2"
apiLevel = 27
systemImageSource = "aosp"
}
}
groups {
maybeCreate("api27and30").apply {
targetDevices.add(devices["pixel2api30"])
targetDevices.add(devices["pixel2api30atd"])
targetDevices.add(devices["pixel2api27"])
targetDevices.add(allDevices.getByName("pixel2api30"))
targetDevices.add(allDevices.getByName("pixel2api30atd"))
targetDevices.add(allDevices.getByName("pixel2api27"))
}
}
}
Expand Down
20 changes: 9 additions & 11 deletions data/schedule/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import com.android.build.api.dsl.ManagedVirtualDevice
import org.gradle.kotlin.dsl.maybeCreate
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
Expand All @@ -23,32 +25,28 @@ android {
}
testOptions {
managedDevices {
devices {
maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel2api30atd").apply {
allDevices {
maybeCreate<ManagedVirtualDevice>("pixel2api30atd").apply {
device = "Pixel 2"
apiLevel = 30
systemImageSource = "aosp-atd"
}
}
devices {
maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel2api30").apply {
maybeCreate<ManagedVirtualDevice>("pixel2api30").apply {
device = "Pixel 2"
apiLevel = 30
systemImageSource = "aosp"
}
}
devices {
maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel2api27").apply {
maybeCreate<ManagedVirtualDevice>("pixel2api27").apply {
device = "Pixel 2"
apiLevel = 27
systemImageSource = "aosp"
}
}
groups {
maybeCreate("api27and30").apply {
targetDevices.add(devices["pixel2api30"])
targetDevices.add(devices["pixel2api30atd"])
targetDevices.add(devices["pixel2api27"])
targetDevices.add(allDevices.getByName("pixel2api30"))
targetDevices.add(allDevices.getByName("pixel2api30atd"))
targetDevices.add(allDevices.getByName("pixel2api27"))
}
}
}
Expand Down
12 changes: 11 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,14 @@ kotlin.code.style=official
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
android.nonFinalResIds=false
android.nonFinalResIds=false
android.defaults.buildfeatures.resvalues=true
android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
android.enableAppCompileTimeRClass=false
android.usesSdkInManifest.disallowed=false
android.uniquePackageNames=false
android.dependency.useConstraints=true
android.r8.strictFullModeForKeepRules=false
android.r8.optimizedResourceShrinking=false
android.builtInKotlin=false
android.newDsl=false
Loading