Merge pull request #1549 from joreilly/project_cleanup

Initial attempt at getting build task running for project

Author: joreilly

androidApp/build.gradle.kts

@@ -113,18 +113,18 @@ android {
 
             matchingFallbacks += listOf("release")
         }
-        create("benchmark") {
-            isShrinkResources = true
-            isMinifyEnabled = true
-            signingConfig = signingConfigs.getByName("confetti")
-            setProguardFiles(
-                listOf(
-                    getDefaultProguardFile("proguard-android.txt"),
-                    "proguard-benchmark.pro"
-                )
-            )
-            matchingFallbacks.addAll(listOf("release"))
-        }
+//        create("benchmark") {
+//            isShrinkResources = true
+//            isMinifyEnabled = true
+//            signingConfig = signingConfigs.getByName("confetti")
+//            setProguardFiles(
+//                listOf(
+//                    getDefaultProguardFile("proguard-android.txt"),
+//                    "proguard-benchmark.pro"
+//                )
+//            )
+//            matchingFallbacks.addAll(listOf("release"))
+//        }
         getByName("debug") {
             signingConfig = signingConfigs.getByName("confetti")
         }

androidBenchmark/build.gradle.kts

@@ -4,11 +4,11 @@ plugins {
 }
 
 android {
-    compileSdk = 33
+    compileSdk = 35
 
     defaultConfig {
         minSdk = 29
-        targetSdk = 33
+        targetSdk = 35
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 

androidBenchmark/src/main/java/dev/johnoreilly/confetti/benchmark/BaselineProfile.kt

@@ -18,7 +18,7 @@ class BaselineProfile {
 
     @Test
     fun openAndScroll() {
-        baselineRule.collectBaselineProfile(
+        baselineRule.collect(
             packageName = "dev.johnoreilly.confetti"
         ) {
             pressHome()

backend/datastore/src/jvmTest/kotlin/test/MainTest.kt

@@ -14,7 +14,7 @@ object WearSdk {
 
 object AutomotiveSdk {
     const val min = 29
-    const val compile = 34
+    const val compile = 35
     const val target = 33
 }
 

build-logic/src/main/kotlin/Dependencies.kt

@@ -2811,12 +2811,7 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-ws@8.5.0:
-  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f"
-  integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==
-
-ws@^8.13.0:
+ws@8.18.0, ws@^8.13.0:
   version "8.18.0"
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc"
   integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==

kotlin-js-store/yarn.lock

@@ -32,8 +32,8 @@ pluginManagement {
 
 rootProject.name = "Confetti"
 include(":androidApp")
-include(":androidBenchmark")
-include(":automotiveApp")
+//include(":androidBenchmark")
+//include(":automotiveApp")
 include(":common:car")
 include(":shared")
 include(":backend")
@@ -44,7 +44,6 @@ include(":backend:terraform")
 include(":landing-page")
 include(":wearApp")
 include(":wearBenchmark")
-include(":webApp")
 include(":compose-desktop")
 include(":compose-web")
 include(":proto")

settings.gradle.kts

@@ -99,13 +99,13 @@ android {
             signingConfig = signingConfigs.getByName("release")
             setProguardFiles(listOf(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"))
         }
-        create("benchmark") {
-            isShrinkResources = true
-            isMinifyEnabled = true
-            signingConfig = signingConfigs.getByName("confetti")
-            setProguardFiles(listOf(getDefaultProguardFile("proguard-android.txt"), "proguard-benchmark.pro"))
-            matchingFallbacks.addAll(listOf("release"))
-        }
+//        create("benchmark") {
+//            isShrinkResources = true
+//            isMinifyEnabled = true
+//            signingConfig = signingConfigs.getByName("confetti")
+//            setProguardFiles(listOf(getDefaultProguardFile("proguard-android.txt"), "proguard-benchmark.pro"))
+//            matchingFallbacks.addAll(listOf("release"))
+//        }
         create("githubRelease") {
             isShrinkResources = true
             isMinifyEnabled = true

wearApp/build.gradle.kts

@@ -12,7 +12,7 @@ class BaselineProfile {
 
     @Test
     fun profile() {
-        baselineRule.collectBaselineProfile(
+        baselineRule.collect(
             packageName = "dev.johnoreilly.confetti"
         ) {
             startActivityAndWait()