From 45b12d709b0692c8b6ed54a5c5e085be8f85b936 Mon Sep 17 00:00:00 2001 From: Ryan Brooks Date: Fri, 24 May 2024 15:12:20 -0700 Subject: [PATCH 1/4] Update to snapshots 1.0/gradle plugin 3.0 (release candidates) --- android/app/build.gradle.kts | 6 ------ android/build.gradle.kts | 1 - android/gradle/libs.versions.toml | 6 ++---- android/settings.gradle.kts | 1 - 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 0e0a08c5..94766103 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -2,7 +2,6 @@ plugins { alias(libs.plugins.android.application) alias(libs.plugins.emerge) alias(libs.plugins.kotlin.android) - alias(libs.plugins.ksp) alias(libs.plugins.kotlin.serialization) } @@ -101,9 +100,4 @@ dependencies { androidTestImplementation(libs.androidx.test.ext.junit) androidTestImplementation(libs.androidx.test.rules) androidTestImplementation(libs.emerge.snapshots) - - // Generates snapshots for any Previews in the main source set - ksp(libs.emerge.snapshots.processor) - // Generates snapshots for any Previews in the androidTest source set - kspAndroidTest(libs.emerge.snapshots.processor) } diff --git a/android/build.gradle.kts b/android/build.gradle.kts index e6ef9503..b1c9b834 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -4,5 +4,4 @@ plugins { alias(libs.plugins.emerge) apply false alias(libs.plugins.kotlin.serialization) apply false alias(libs.plugins.kotlin.android) apply false - alias(libs.plugins.ksp) apply false } diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index d11c1a24..9a356718 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -6,11 +6,10 @@ androidx-test-ext = "1.1.5" accompanist = "0.33.2-alpha" compose-bom = "2024.02.02" compose-compiler-extension = "1.5.3" -emerge-gradle-plugin = "2.2.0" +emerge-gradle-plugin = "3.0.0-rc03" emerge-perf = "2.1.1" -emerge-snapshots = "0.8.4" +emerge-snapshots = "1.0.0-rc02" kotlin = "1.9.10" -ksp = "1.9.10-1.0.13" material-compose = "1.6.3" navigation-compose = "2.7.7" okhttp = "4.11.0" @@ -21,7 +20,6 @@ android-test = { id = "com.android.test", version.ref = "agp" } emerge = { id = "com.emergetools.android", version.ref = "emerge-gradle-plugin" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } -ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } [libraries] accompanist-navigationanim = { module = "com.google.accompanist:accompanist-navigation-animation", version.ref = "accompanist" } diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts index 68ccc9f2..beee951a 100644 --- a/android/settings.gradle.kts +++ b/android/settings.gradle.kts @@ -3,7 +3,6 @@ rootProject.name = "HackerNews" pluginManagement { repositories { gradlePluginPortal() - mavenLocal() google() } } From ef6747729f751aacc44f10dd0b3db16b0ed0dfa1 Mon Sep 17 00:00:00 2001 From: Ryan Brooks Date: Fri, 24 May 2024 15:49:50 -0700 Subject: [PATCH 2/4] Remove processor --- android/app/build.gradle.kts | 2 +- android/gradle/libs.versions.toml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 94766103..4afebae2 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -93,11 +93,11 @@ dependencies { testImplementation(libs.junit) + androidTestImplementation(libs.emerge.snapshots) androidTestImplementation(libs.junit) androidTestImplementation(libs.androidx.core) androidTestImplementation(libs.androidx.fragment) androidTestImplementation(libs.androidx.test.core) androidTestImplementation(libs.androidx.test.ext.junit) androidTestImplementation(libs.androidx.test.rules) - androidTestImplementation(libs.emerge.snapshots) } diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 9a356718..61659929 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -42,7 +42,6 @@ compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling emerge-perf = { module = "com.emergetools.test:performance", version.ref = "emerge-perf" } emerge-snapshots = { module = "com.emergetools.snapshots:snapshots", version.ref = "emerge-snapshots" } emerge-snapshots-annotations = { module = "com.emergetools.snapshots:snapshots-annotations", version.ref = "emerge-snapshots" } -emerge-snapshots-processor = { module = "com.emergetools.snapshots:snapshots-processor", version.ref = "emerge-snapshots" } junit = "junit:junit:4.13.2" From d4f6c5a542a6efdfb5bb7942683364a3426b260f Mon Sep 17 00:00:00 2001 From: Ryan Brooks Date: Fri, 24 May 2024 16:21:35 -0700 Subject: [PATCH 3/4] Tweaks --- .../com/emergetools/hackernews/StoryComposableSnapshotTest.kt | 3 +-- .../main/kotlin/com/emergetools/hackernews/ui/items/Comment.kt | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/android/app/src/androidTest/kotlin/com/emergetools/hackernews/StoryComposableSnapshotTest.kt b/android/app/src/androidTest/kotlin/com/emergetools/hackernews/StoryComposableSnapshotTest.kt index 90584f4f..979fe160 100644 --- a/android/app/src/androidTest/kotlin/com/emergetools/hackernews/StoryComposableSnapshotTest.kt +++ b/android/app/src/androidTest/kotlin/com/emergetools/hackernews/StoryComposableSnapshotTest.kt @@ -7,8 +7,7 @@ import com.emergetools.hackernews.ui.items.BuildStory /** * Example generated snapshot test from androidTest source set. - * To generate a snapshot test for this preview, add the snapshot-processor as a kspAndroidTest - * dependency. + * To generate a snapshot test for this preview, add the androidTest source set to the debug variant. */ @Preview @Composable diff --git a/android/app/src/main/kotlin/com/emergetools/hackernews/ui/items/Comment.kt b/android/app/src/main/kotlin/com/emergetools/hackernews/ui/items/Comment.kt index b98748c1..68eeca2a 100644 --- a/android/app/src/main/kotlin/com/emergetools/hackernews/ui/items/Comment.kt +++ b/android/app/src/main/kotlin/com/emergetools/hackernews/ui/items/Comment.kt @@ -34,7 +34,6 @@ fun BuildComment( /** * Example generated snapshot test from main source set. - * To generate a snapshot test for this preview, add the snapshot-processor as a ksp dependency. */ @SnapshotTestingPreviews @Preview From 2e9fcdf7b1c0cb5f076d8e1e8efaf8d90561df1b Mon Sep 17 00:00:00 2001 From: Ryan Brooks Date: Wed, 29 May 2024 17:28:26 -0700 Subject: [PATCH 4/4] stable --- android/gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 61659929..ec6303b5 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -6,9 +6,9 @@ androidx-test-ext = "1.1.5" accompanist = "0.33.2-alpha" compose-bom = "2024.02.02" compose-compiler-extension = "1.5.3" -emerge-gradle-plugin = "3.0.0-rc03" +emerge-gradle-plugin = "3.0.0" emerge-perf = "2.1.1" -emerge-snapshots = "1.0.0-rc02" +emerge-snapshots = "1.0.0" kotlin = "1.9.10" material-compose = "1.6.3" navigation-compose = "2.7.7"