From 89704b0b26b6d0dc8be2b8fda6d6da7831d68be9 Mon Sep 17 00:00:00 2001
From: Jake Wharton <jw@squareup.com>
Date: Thu, 11 Aug 2022 23:29:08 -0400
Subject: [PATCH] Fix a bunch of things

---
 .github/dependabot.yaml                       |  4 ++++
 .github/workflows/release.yaml                |  2 +-
 build.gradle                                  | 23 ++-----------------
 .../jakewharton/mosaic/gradle/FixtureTest.kt  |  1 +
 samples/build.gradle                          |  6 -----
 5 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
index 81bae9ac..5a567633 100644
--- a/.github/dependabot.yaml
+++ b/.github/dependabot.yaml
@@ -5,3 +5,7 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+  - package-ecosystem: "gradle"
+    directory: "/"
+    schedule:
+      interval: "daily"
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 307d8c77..fc6ee690 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -45,6 +45,6 @@ jobs:
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           BRANCH: site
-          FOLDER: mosaic/build/dokka/htmlMultiModule
+          FOLDER: build/dokka/htmlMultiModule
           TARGET_FOLDER: docs/0.x/
           CLEAN: true
diff --git a/build.gradle b/build.gradle
index f098876b..cb7a057d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,13 +10,11 @@ buildscript {
 		// plugin whose classloading causes com.android.build.gradle.api.BaseVariant to also be loaded.
 		classpath 'com.android.tools.build:gradle:4.2.0'
 		classpath 'com.vanniktech:gradle-maven-publish-plugin:0.13.0'
-		classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.4.30'
+		classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.7.10'
 	}
 	repositories {
 		mavenCentral()
 		google()
-		gradlePluginPortal()
-		jcenter() // Dokka
 	}
 }
 
@@ -31,17 +29,6 @@ allprojects {
 	repositories {
 		mavenCentral()
 		google()
-		jcenter {
-			mavenContent {
-				includeModule("org.jetbrains.kotlinx", "kotlinx-html-jvm")
-			}
-		}
-	}
-
-	tasks.withType(KotlinCompile).configureEach {
-		kotlinOptions {
-			jvmTarget = '1.8'
-		}
 	}
 
 	tasks.withType(JavaCompile).configureEach {
@@ -53,17 +40,11 @@ allprojects {
 		task.kotlinOptions {
 			freeCompilerArgs += [
 				'-Xjvm-default=all',
-				'-Xopt-in=kotlin.RequiresOptIn',
+				'-opt-in=kotlin.RequiresOptIn',
 			]
 		}
 	}
 
-	tasks.withType(KotlinJvmCompile).configureEach { task ->
-		task.kotlinOptions {
-			jvmTarget = "1.8"
-		}
-	}
-
 	plugins.withId('com.vanniktech.maven.publish') {
 		mavenPublish {
 			targets {
diff --git a/mosaic-gradle-plugin/src/test/kotlin/com/jakewharton/mosaic/gradle/FixtureTest.kt b/mosaic-gradle-plugin/src/test/kotlin/com/jakewharton/mosaic/gradle/FixtureTest.kt
index fb7b942e..0a1c58aa 100644
--- a/mosaic-gradle-plugin/src/test/kotlin/com/jakewharton/mosaic/gradle/FixtureTest.kt
+++ b/mosaic-gradle-plugin/src/test/kotlin/com/jakewharton/mosaic/gradle/FixtureTest.kt
@@ -30,6 +30,7 @@ class FixtureTest(
 		GradleRunner.create()
 			.withProjectDir(fixtureDir)
 			.withArguments("clean", "build", "--stacktrace", versionProperty())
+			.withDebug(true) // Run in-process for speed.
 			.build()
 	}
 }
diff --git a/samples/build.gradle b/samples/build.gradle
index 1f73f7b6..735fb39b 100644
--- a/samples/build.gradle
+++ b/samples/build.gradle
@@ -18,10 +18,4 @@ subprojects {
 		mavenCentral()
 		google()
 	}
-
-	tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
-		kotlinOptions {
-			jvmTarget = '1.8'
-		}
-	}
 }