Merge pull request #36 from ScottPierce/scott/Kotlin_1_6

Kotlin 1.6.10

Author: ScottPierce

.circleci/config.yml

@@ -1,37 +1,24 @@
 job_config: &job_config
   working_directory: ~/workspace
   docker:
-    - image: circleci/openjdk:8u212-jdk-stretch
+    - image: cimg/openjdk:11.0-browsers
 
 version: 2.1
+orbs:
+  browser-tools: circleci/browser-tools@1.1
 jobs:
   code style:
     <<: *job_config
     steps:
       - checkout
 
-      - add_ssh_keys:
-          fingerprints:
-            - b8:e3:f1:7e:67:7d:04:92:2f:be:8b:e4:93:b6:79:1d
-
-      - run:
-          name: Configure GIT
-          command: |
-            git config user.email "circleci@circleci.com"
-            git config user.name "CircleCI"
-            git push --set-upstream origin ${CIRCLE_BRANCH}
-
       - restore_cache:
           keys:
             - codestyle-{{ checksum "buildSrc/src/main/kotlin/Deps.kt" }}
 
       - run:
           name: Perform code style check
-          command: ./gradlew ktlintFormat
-
-      - run:
-          name: Commit code style changes
-          command: scripts/git-commit-if-changes.sh "code style"
+          command: ./gradlew ktlint
 
       - save_cache:
           paths:
@@ -59,6 +46,7 @@ jobs:
   unit test:
     <<: *job_config
     steps:
+      - browser-tools/install-browser-tools
       - checkout
 
       - restore_cache:
@@ -86,10 +74,6 @@ jobs:
     steps:
       - checkout
 
-      - add_ssh_keys:
-          fingerprints:
-            - b8:e3:f1:7e:67:7d:04:92:2f:be:8b:e4:93:b6:79:1d
-
       - restore_cache:
           keys:
             - upload-{{ checksum "buildSrc/src/main/kotlin/Deps.kt" }}
@@ -118,27 +102,6 @@ jobs:
           name: Upload kotlin-html-ktor to Bintray and Publish
           command: ./gradlew :kotlin-html-ktor:bintrayUpload
 
-      - run:
-          name: Checkout Master
-          command: git checkout master
-
-      - run:
-          name: Configure GIT
-          command: |
-            git config user.email "circleci@circleci.com"
-            git config user.name "CircleCI"
-            git fetch origin
-            git pull
-            git push --set-upstream origin master
-
-      - run:
-          name: Update version in documentation
-          command: ./gradlew updateVersionInDocumentation
-
-      - run:
-          name: Commit documentation changes
-          command: scripts/git-commit-if-changes.sh "version update for release"
-
       - save_cache:
           paths:
             - ~/.gradle

.github/workflows/build.yml

@@ -0,0 +1,47 @@
+name: Build
+
+on:
+  pull_request:
+
+jobs:
+  code-style:
+    name: Code Style
+    runs-on: ubuntu-latest
+    container:
+      image: openjdk:11-slim
+
+    permissions:
+      contents: write
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Kotlin Code Style
+        run: ./gradlew ktlint
+
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    container:
+      image: openjdk:17-slim
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Build
+        run: ./gradlew :kotlin-html-writer:assemble :kotlin-html-ktor:assemble --stacktrace
+
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+    container:
+      image: markhobson/maven-chrome:jdk-17
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Test
+        run: ./gradlew :kotlin-html-writer:jvmTest :kotlin-html-writer:jvmCodeCoverageReport --stacktrace

.gitignore

@@ -8,3 +8,4 @@ out/
 
 /.idea/*
 !/.idea/codeStyles
+local.properties

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.8.0
+* Deploy to maven central
+* Update to Kotlin 1.6.10
+
 ## 0.7.0
 * `styleBuilder` is renamed to `insertStyleBuilder`.
 

README.md

@@ -1,5 +1,4 @@
 [![CircleCI](https://circleci.com/gh/ScottPierce/kotlin-html/tree/master.svg?style=svg)](https://circleci.com/gh/ScottPierce/kotlin-html/tree/master)
-[![jcenter](https://api.bintray.com/packages/scottpierce/maven/kotlin-html/images/download.svg?version=0.7.24)](https://bintray.com/beta/#/scottpierce/maven/kotlin-html/0.7.24?tab=overview)
 [![Kotlin](https://img.shields.io/badge/Kotlin-1.3.70-green.svg)](https://kotlinlang.org/)
 [![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-green.svg?style=flat)](https://www.apache.org/licenses/LICENSE-2.0)
 <!---

benchmark/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("org.jetbrains.kotlin.multiplatform")
+    kotlin("multiplatform")
 }
 
 kotlin {

build.gradle.kts

@@ -3,12 +3,12 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 buildscript {
     repositories {
-        jcenter()
-        maven { url = uri("https://dl.bintray.com/kotlin/kotlin-eap") }
+        mavenCentral()
     }
 
     dependencies {
         classpath(Plugins.kotlin)
+        classpath(Plugins.gradleMavenPublish)
     }
 }
 
@@ -31,25 +31,36 @@ allprojects {
 
 subprojects {
     repositories {
-        jcenter()
-        maven {
-            url = uri("https://dl.bintray.com/kotlin/kotlinx.html/")
-        }
-        maven { url = uri("https://dl.bintray.com/kotlin/kotlin-eap") }
-        maven {
-            url = uri("https://kotlin.bintray.com/ktor")
-            content {
-                includeGroup("io.ktor")
-            }
-        }
+        mavenCentral()
     }
 
     tasks.withType<KotlinCompile> {
         kotlinOptions.jvmTarget = "1.8"
+    }
+
+    plugins.withId("maven-publish") {
+        extensions.getByType<PublishingExtension>().apply {
+            repositories {
+                maven {
+                    name = "GitHubPackages"
+                    url = uri("https://maven.pkg.github.com/ScottPierce/kotlin-html")
+                    credentials {
+                        username = project.findProperty("gpr.user") as String? ?: System.getenv("USERNAME")
+                        password = project.findProperty("gpr.token") as String? ?: System.getenv("TOKEN")
+                    }
+                }
+            }
+        }
+    }
 
-        kotlinOptions.freeCompilerArgs += listOf(
-            "-Xuse-experimental=kotlin.tim.ExperimentalTime"
-        )
+    plugins.withId("org.jetbrains.kotlin.multiplatform") {
+        configure<org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension> {
+            sourceSets.configureEach {
+                languageSettings.apply {
+                    optIn("kotlin.time.ExperimentalTime")
+                }
+            }
+        }
     }
 }
 

buildSrc/build.gradle.kts

@@ -4,5 +4,5 @@ plugins {
 }
 
 repositories {
-    jcenter()
+    mavenCentral()
 }

buildSrc/src/main/kotlin/Bintray.kt

@@ -1,10 +1,11 @@
 object Versions {
-    const val kotlin = "1.3.72"
-    const val ktor = "1.3.2"
+    const val kotlin = "1.7.21"
+    const val ktor = "1.6.7"
 }
 
 object Plugins {
-    val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"
+    const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"
+    const val gradleMavenPublish = "com.vanniktech:gradle-maven-publish-plugin:0.19.0"
 }
 
 object Deps {
@@ -38,9 +39,9 @@ class KotlinTestLibs internal constructor() {
 
 class KotlinxDeps internal constructor() {
     val coroutines = CoroutineDeps()
-    val html = "org.jetbrains.kotlinx:kotlinx-html-jvm:0.6.12"
+    val html = "org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.3"
 }
 
 class CoroutineDeps internal constructor() {
-    val jvm = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8"
+    val jvm = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
 }