Fix a bunch of things

This commit is contained in:
Jake Wharton
2022-08-11 23:29:08 -04:00
committed by Jake Wharton
parent 8ea89df52f
commit 89704b0b26
5 changed files with 8 additions and 28 deletions

View File

@ -5,3 +5,7 @@ updates:
directory: "/"
schedule:
interval: "daily"
- package-ecosystem: "gradle"
directory: "/"
schedule:
interval: "daily"

View File

@ -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

View File

@ -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 {

View File

@ -30,6 +30,7 @@ class FixtureTest(
GradleRunner.create()
.withProjectDir(fixtureDir)
.withArguments("clean", "build", "--stacktrace", versionProperty())
.withDebug(true) // Run in-process for speed.
.build()
}
}

View File

@ -18,10 +18,4 @@ subprojects {
mavenCentral()
google()
}
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
kotlinOptions {
jvmTarget = '1.8'
}
}
}