[feature/#719] Fix local build

DroidKaigi · May 27, 2024 · 6a7a2e3 · 6a7a2e3
1 parent c9d90ba
commit 6a7a2e3
Show file tree

Hide file tree

Showing 10 changed files with 46,352 additions and 19 deletions.
diff --git a/app-android/build.gradle.kts b/app-android/build.gradle.kts
@@ -89,7 +89,11 @@ android {
             signingConfig = signingConfigs.getByName("debug")
             matchingFallbacks += listOf("release")
             isDebuggable = false
-            proguardFiles("benchmark-rules.pro")
+            isMinifyEnabled = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
         }
     }
 }

diff --git a/app-android/src/devRelease/generated/baselineProfiles/baseline-prof.txt b/app-android/src/devRelease/generated/baselineProfiles/baseline-prof.txt
diff --git a/app-android/src/prodRelease/generated/baselineProfiles/baseline-prof.txt b/app-android/src/prodRelease/generated/baselineProfiles/baseline-prof.txt
diff --git a/baselineprofile/build.gradle.kts b/baselineprofile/build.gradle.kts
@@ -1,23 +1,22 @@
 import com.android.build.api.dsl.ManagedVirtualDevice
 
-@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
 plugins {
     alias(libs.plugins.androidTest)
     alias(libs.plugins.kotlinGradlePlugin)
     alias(libs.plugins.androidx.baselineprofile)
 }
 
 android {
-    namespace = "io.github.droidkaigi.confsched2023"
+    namespace = "io.github.droidkaigi.confsched2023.baselineprofile"
     compileSdk = 34
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
 
     defaultConfig {
@@ -32,8 +31,22 @@ android {
 
     flavorDimensions += listOf("network")
     productFlavors {
-        create("dev") { dimension = "network" }
-        create("prod") { dimension = "network" }
+        create("dev") {
+            dimension = "network"
+            buildConfigField(
+                "String",
+                "APP_FLAVOR_SUFFIX",
+                "\".dev\""
+            )
+        }
+        create("prod") {
+            dimension = "network"
+            buildConfigField(
+                "String",
+                "APP_FLAVOR_SUFFIX",
+                "\"\""
+            )
+        }
     }
 
     testOptions.managedDevices.devices {

diff --git a/baselineprofile/src/main/java/io/github/droidkaigi/confsched2023/Constant.kt b/baselineprofile/src/main/java/io/github/droidkaigi/confsched2023/Constant.kt
diff --git a/...ineprofile/src/main/java/io/github/droidkaigi/confsched2023/baselineprofile/AppStrings.kt b/...ineprofile/src/main/java/io/github/droidkaigi/confsched2023/baselineprofile/AppStrings.kt
@@ -0,0 +1,6 @@
+package io.github.droidkaigi.confsched2023.baselineprofile
+
+val PACKAGE_NAME = buildString {
+    append("io.github.droidkaigi.confsched2023")
+    append(BuildConfig.APP_FLAVOR_SUFFIX)
+}
diff --git a/...confsched2023/BaselineProfileGenerator.kt → ...selineprofile/BaselineProfileGenerator.kt b/...confsched2023/BaselineProfileGenerator.kt → ...selineprofile/BaselineProfileGenerator.kt
@@ -1,4 +1,4 @@
-package io.github.droidkaigi.confsched2023
+package io.github.droidkaigi.confsched2023.baselineprofile
 
 import androidx.benchmark.macro.junit4.BaselineProfileRule
 import androidx.test.ext.junit.runners.AndroidJUnit4

diff --git a/...dkaigi/confsched2023/StartupBenchmarks.kt → ...2023/baselineprofile/StartupBenchmarks.kt b/...dkaigi/confsched2023/StartupBenchmarks.kt → ...2023/baselineprofile/StartupBenchmarks.kt
@@ -1,4 +1,4 @@
-package io.github.droidkaigi.confsched2023
+package io.github.droidkaigi.confsched2023.baselineprofile
 
 import androidx.benchmark.macro.BaselineProfileMode
 import androidx.benchmark.macro.CompilationMode

diff --git a/build-logic/src/main/kotlin/io/github/droidkaigi/confsched2023/primitive/KmpPlugin.kt b/build-logic/src/main/kotlin/io/github/droidkaigi/confsched2023/primitive/KmpPlugin.kt
@@ -13,7 +13,7 @@ class KmpPlugin : Plugin<Project> {
             with(pluginManager) {
                 apply("org.jetbrains.kotlin.multiplatform")
             }
-            tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class.java) {
+            tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) {
                 kotlinOptions.jvmTarget = "11"
             }
             tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinNativeLink>().configureEach {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -39,8 +39,8 @@ twitterComposeRule = "0.0.26"
 lottie = "6.1.0"
 kover = "0.7.3"
 uiautomator = "2.2.0"
-benchmark-macro-junit4 = "1.2.0-beta01"
-androidx-baselineprofile = "1.2.0-beta01"
+benchmark-macro-junit4 = "1.2.4"
+androidx-baselineprofile = "1.2.4"
 profileinstaller = "1.3.1"
 
 [libraries]