Merge pull request #19 from dhakehurst/webworkers

Release 3.5.0
dhakehurst · Apr 9, 2020 · b40ccfe · b40ccfe
2 parents f853f01 + c917c4c
commit b40ccfe
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/net.akehurst.language/agl-processor/build.gradle.kts b/net.akehurst.language/agl-processor/build.gradle.kts
@@ -17,7 +17,21 @@ kt2ts {
             "net.akehurst.language.api.processor.*",
             "net.akehurst.language.api.sppt.*",
             "net.akehurst.language.api.style.*",
-            "net.akehurst.language.processor.Agl"
+            "net.akehurst.language.agl.processor.Agl"
     ))
 }
-
+/*
+tasks {
+    val dokkaJavadoc by creating(org.jetbrains.dokka.gradle.DokkaTask::class) {
+        outputFormat = "javadoc"
+        outputDirectory = "$buildDir/dokka"
+        multiplatform {
+            val jvm8 by creating {
+                targets = listOf("JVM")
+                platform = "jvm"
+                jdkVersion = 8
+                noJdkLink = true
+            }
+        }
+    }
+}*/
diff --git a/net.akehurst.language/build.gradle.kts b/net.akehurst.language/build.gradle.kts
@@ -22,10 +22,12 @@ import java.io.File
 import java.time.Instant
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
+import org.jetbrains.dokka.gradle.DokkaTask
 
 plugins {
     kotlin("multiplatform") version("1.3.71") apply false
     id("com.jfrog.bintray") version("1.8.4") apply false
+    id("org.jetbrains.dokka") version("0.10.1") apply false
 }
 
 allprojects {
@@ -48,6 +50,7 @@ subprojects {
     apply(plugin="org.jetbrains.kotlin.multiplatform")
     apply(plugin = "maven-publish")
     apply(plugin = "com.jfrog.bintray")
+    apply(plugin = "org.jetbrains.dokka")
 
     repositories {
         mavenCentral()
@@ -85,6 +88,8 @@ subprojects {
         }
     }
 
+
+
     val now = Instant.now()
     fun fBbuildStamp(): String {
         return DateTimeFormatter.ISO_DATE_TIME.withZone(ZoneId.of("UTC")).format(now)

diff --git a/net.akehurst.language/gradle/wrapper/gradle-wrapper.properties b/net.akehurst.language/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip