Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

Fix app id name clash in benchmark module

Wojtek Kaliciński7afc3562dc9f
diff --git a/benchmark/build.gradle.kts b/benchmarks/build.gradle.kts
similarity index 97%
rename from benchmark/build.gradle.kts
rename to benchmarks/build.gradle.kts
index 0cbde5bd3..3271250dd 100644
--- a/benchmark/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
}
android {
- namespace = "com.google.samples.apps.nowinandroid.benchmark"
+ namespace = "com.google.samples.apps.nowinandroid.benchmarks"
defaultConfig {
minSdk = 23
diff --git a/benchmark/src/main/AndroidManifest.xml b/benchmarks/src/main/AndroidManifest.xml
similarity index 100%
rename from benchmark/src/main/AndroidManifest.xml
rename to benchmarks/src/main/AndroidManifest.xml
diff --git a/benchmark/src/main/java/com/google/samples/apps/nowinandroid/Utils.kt b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/Utils.kt
similarity index 68%
rename from benchmark/src/main/java/com/google/samples/apps/nowinandroid/Utils.kt
rename to benchmarks/src/main/java/com/google/samples/apps/nowinandroid/Utils.kt
index 41f817c8d..ffb3da23c 100644
--- a/benchmark/src/main/java/com/google/samples/apps/nowinandroid/Utils.kt
+++ b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/Utils.kt
@@ -16,10 +16,16 @@
package com.google.samples.apps.nowinandroid
-import com.google.samples.apps.nowinandroid.benchmark.BuildConfig
+import com.google.samples.apps.nowinandroid.benchmarks.BuildConfig
/**
* Convenience parameter to use proper package name with regards to build type and build flavor.
*/
-const val PACKAGE_NAME =
- "com.google.samples.apps.nowinandroid.${BuildConfig.FLAVOR}.${BuildConfig.BUILD_TYPE}"
+val PACKAGE_NAME = StringBuilder("com.google.samples.apps.nowinandroid").apply {
+ if (BuildConfig.FLAVOR != "prod") {
+ append(".${BuildConfig.FLAVOR}")
+ }
+ if (BuildConfig.BUILD_TYPE != "release") {
+ append(".${BuildConfig.BUILD_TYPE}")
+ }
+}.toString()
diff --git a/benchmark/src/main/java/com/google/samples/apps/nowinandroid/baselineprofile/BaselineProfileGenerator.kt b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/baselineprofile/BaselineProfileGenerator.kt
similarity index 100%
rename from benchmark/src/main/java/com/google/samples/apps/nowinandroid/baselineprofile/BaselineProfileGenerator.kt
rename to benchmarks/src/main/java/com/google/samples/apps/nowinandroid/baselineprofile/BaselineProfileGenerator.kt
diff --git a/benchmark/src/main/java/com/google/samples/apps/nowinandroid/bookmarks/BookmarksActions.kt b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/bookmarks/BookmarksActions.kt
similarity index 100%
rename from benchmark/src/main/java/com/google/samples/apps/nowinandroid/bookmarks/BookmarksActions.kt
rename to benchmarks/src/main/java/com/google/samples/apps/nowinandroid/bookmarks/BookmarksActions.kt
diff --git a/benchmark/src/main/java/com/google/samples/apps/nowinandroid/foryou/ForYouActions.kt b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/foryou/ForYouActions.kt
similarity index 100%
rename from benchmark/src/main/java/com/google/samples/apps/nowinandroid/foryou/ForYouActions.kt
rename to benchmarks/src/main/java/com/google/samples/apps/nowinandroid/foryou/ForYouActions.kt
diff --git a/benchmark/src/main/java/com/google/samples/apps/nowinandroid/foryou/ScrollForYouFeedBenchmark.kt b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/foryou/ScrollForYouFeedBenchmark.kt
similarity index 100%
rename from benchmark/src/main/java/com/google/samples/apps/nowinandroid/foryou/ScrollForYouFeedBenchmark.kt
rename to benchmarks/src/main/java/com/google/samples/apps/nowinandroid/foryou/ScrollForYouFeedBenchmark.kt
diff --git a/benchmark/src/main/java/com/google/samples/apps/nowinandroid/interests/InterestsActions.kt b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/interests/InterestsActions.kt
similarity index 100%
rename from benchmark/src/main/java/com/google/samples/apps/nowinandroid/interests/InterestsActions.kt
rename to benchmarks/src/main/java/com/google/samples/apps/nowinandroid/interests/InterestsActions.kt
diff --git a/benchmark/src/main/java/com/google/samples/apps/nowinandroid/interests/TopicsScreenRecompositionBenchmark.kt b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/interests/TopicsScreenRecompositionBenchmark.kt
similarity index 100%
rename from benchmark/src/main/java/com/google/samples/apps/nowinandroid/interests/TopicsScreenRecompositionBenchmark.kt
rename to benchmarks/src/main/java/com/google/samples/apps/nowinandroid/interests/TopicsScreenRecompositionBenchmark.kt
diff --git a/benchmark/src/main/java/com/google/samples/apps/nowinandroid/startup/StartupBenchmark.kt b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/startup/StartupBenchmark.kt
similarity index 100%
rename from benchmark/src/main/java/com/google/samples/apps/nowinandroid/startup/StartupBenchmark.kt
rename to benchmarks/src/main/java/com/google/samples/apps/nowinandroid/startup/StartupBenchmark.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d8ff0162c..cfa31a150 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -33,7 +33,7 @@ dependencyResolutionManagement {
rootProject.name = "nowinandroid"
include(":app")
include(":app-nia-catalog")
-include(":benchmark")
+include(":benchmarks")
include(":core:common")
include(":core:data")
include(":core:data-test")