Merge pull request #1193 from android/wff-validate

Adds use of validator plugin

WatchFaceFormat/Complications/build.gradle.kts

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- plugins {
-    id("com.android.application") version "8.6.1" apply false
-}
+
+plugins {
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.kotlin.android) apply false
+}

WatchFaceFormat/Complications/gradle/libs.versions.toml

@@ -0,0 +1,9 @@
+[versions]
+androidGradlePlugin = "8.7.0"
+kotlin = "1.9.25"
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+
+

WatchFaceFormat/Complications/settings.gradle.kts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 pluginManagement {
+    includeBuild("../validator-plugin")
     repositories {
         google()
         mavenCentral()
@@ -27,6 +28,8 @@ dependencyResolutionManagement {
         mavenCentral()
     }
 }
+// See: https://medium.com/@ttdevelopment/encountering-the-unable-to-make-progress-running-work-error-in-gradle-6bc363ac1eb8
+gradle.startParameter.excludedTaskNames.addAll(listOf(":validator-plugin:plugins:testClasses"))
 
 rootProject.name = "Complications"
-include(":watchface")
+include(":watchface")

WatchFaceFormat/Complications/watchface/build.gradle.kts

@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 plugins {
-    id("com.android.application")
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    // Use the locally-defined validator to demonstrate validation on-build.
+    id("com.google.wff.validatorplugin")
 }
 
 android {

WatchFaceFormat/Flavors/build.gradle.kts

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- plugins {
-    id("com.android.application") version "8.6.1" apply false
-}
+
+plugins {
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.kotlin.android) apply false
+}

WatchFaceFormat/Flavors/gradle/libs.versions.toml

@@ -0,0 +1,9 @@
+[versions]
+androidGradlePlugin = "8.7.0"
+kotlin = "1.9.25"
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+
+

WatchFaceFormat/Flavors/settings.gradle.kts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 pluginManagement {
+    includeBuild("../validator-plugin")
     repositories {
         google()
         mavenCentral()
@@ -27,6 +28,8 @@ dependencyResolutionManagement {
         mavenCentral()
     }
 }
+// See: https://medium.com/@ttdevelopment/encountering-the-unable-to-make-progress-running-work-error-in-gradle-6bc363ac1eb8
+gradle.startParameter.excludedTaskNames.addAll(listOf(":validator-plugin:plugins:testClasses"))
 
 rootProject.name = "Flavors"
-include(":watchface")
+include(":watchface")

WatchFaceFormat/Flavors/watchface/build.gradle.kts

@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 plugins {
-    id("com.android.application")
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    // Use the locally-defined validator to demonstrate validation on-build.
+    id("com.google.wff.validatorplugin")
 }
 
 android {

WatchFaceFormat/SimpleAnalog/build.gradle.kts

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- plugins {
-    id("com.android.application") version "8.6.1" apply false
-}
+
+plugins {
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.kotlin.android) apply false
+}

WatchFaceFormat/SimpleAnalog/gradle/libs.versions.toml

@@ -0,0 +1,9 @@
+[versions]
+androidGradlePlugin = "8.7.0"
+kotlin = "1.9.25"
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+
+

WatchFaceFormat/SimpleAnalog/settings.gradle.kts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 pluginManagement {
+    includeBuild("../validator-plugin")
     repositories {
         google()
         mavenCentral()
@@ -27,6 +28,8 @@ dependencyResolutionManagement {
         mavenCentral()
     }
 }
+// See: https://medium.com/@ttdevelopment/encountering-the-unable-to-make-progress-running-work-error-in-gradle-6bc363ac1eb8
+gradle.startParameter.excludedTaskNames.addAll(listOf(":validator-plugin:plugins:testClasses"))
 
 rootProject.name = "SimpleAnalog"
-include(":watchface")
+include(":watchface")

WatchFaceFormat/SimpleAnalog/watchface/build.gradle.kts

@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 plugins {
-    id("com.android.application")
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    // Use the locally-defined validator to demonstrate validation on-build.
+    id("com.google.wff.validatorplugin")
 }
 
 android {

WatchFaceFormat/SimpleDigital/build.gradle.kts

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- plugins {
-    id("com.android.application") version "8.6.1" apply false
-}
+
+plugins {
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.kotlin.android) apply false
+}

WatchFaceFormat/SimpleDigital/gradle/libs.versions.toml

@@ -0,0 +1,9 @@
+[versions]
+androidGradlePlugin = "8.7.0"
+kotlin = "1.9.25"
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+
+

WatchFaceFormat/SimpleDigital/settings.gradle.kts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 pluginManagement {
+    includeBuild("../validator-plugin")
     repositories {
         google()
         mavenCentral()
@@ -27,6 +28,8 @@ dependencyResolutionManagement {
         mavenCentral()
     }
 }
+// See: https://medium.com/@ttdevelopment/encountering-the-unable-to-make-progress-running-work-error-in-gradle-6bc363ac1eb8
+gradle.startParameter.excludedTaskNames.addAll(listOf(":validator-plugin:plugins:testClasses"))
 
 rootProject.name = "SimpleDigital"
-include(":watchface")
+include(":watchface")

WatchFaceFormat/SimpleDigital/watchface/build.gradle.kts

@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 plugins {
-    id("com.android.application")
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    // Use the locally-defined validator to demonstrate validation on-build.
+    id("com.google.wff.validatorplugin")
 }
 
 android {

WatchFaceFormat/Weather/build.gradle.kts

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- plugins {
-    id("com.android.application") version "8.6.1" apply false
-}
+
+plugins {
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.kotlin.android) apply false
+}

WatchFaceFormat/Weather/gradle/libs.versions.toml

@@ -0,0 +1,9 @@
+[versions]
+androidGradlePlugin = "8.7.0"
+kotlin = "1.9.25"
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+
+

WatchFaceFormat/Weather/settings.gradle.kts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 pluginManagement {
+    includeBuild("../validator-plugin")
     repositories {
         google()
         mavenCentral()
@@ -27,6 +28,8 @@ dependencyResolutionManagement {
         mavenCentral()
     }
 }
+// See: https://medium.com/@ttdevelopment/encountering-the-unable-to-make-progress-running-work-error-in-gradle-6bc363ac1eb8
+gradle.startParameter.excludedTaskNames.addAll(listOf(":validator-plugin:plugins:testClasses"))
 
 rootProject.name = "Weather"
-include(":watchface")
+include(":watchface")

WatchFaceFormat/Weather/watchface/build.gradle.kts

@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 plugins {
-    id("com.android.application")
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    // Use the locally-defined validator to demonstrate validation on-build.
+    id("com.google.wff.validatorplugin")
 }
 
 android {

WatchFaceFormat/validator-plugin/gradle.properties

@@ -0,0 +1,2 @@
+# Gradle properties are not passed to included builds https://github.com/gradle/gradle/issues/2534
+org.gradle.parallel=true

WatchFaceFormat/validator-plugin/gradle/libs.versions.toml

@@ -0,0 +1,9 @@
+[versions]
+androidGradlePlugin = "8.7.0"
+kotlin = "1.9.25"
+
+[libraries]
+android-gradlePlugin-api = { group = "com.android.tools.build", name = "gradle-api", version.ref = "androidGradlePlugin" }
+
+[plugins]
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

WatchFaceFormat/validator-plugin/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

WatchFaceFormat/validator-plugin/plugins/build.gradle.kts

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    `java-gradle-plugin`
+    alias(libs.plugins.kotlin.jvm)
+}
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
+
+dependencies {
+    implementation("com.android.tools.build:gradle-api:7.1.0-alpha13")
+
+    implementation("io.ktor:ktor-client-core:3.0.0")
+    runtimeOnly("io.ktor:ktor-client-okhttp:3.0.0")
+
+    compileOnly(libs.android.gradlePlugin.api)
+    implementation(gradleKotlinDsl())
+}
+
+gradlePlugin {
+    plugins {
+        create("wffValidatorPlugin") {
+            id = "com.google.wff.validatorplugin"
+            implementationClass = "WffValidatorPlugin"
+        }
+    }
+}