Updated to 0.0.5

code0x378 · Feb 23, 2020 · 6bf2ec8 · 6bf2ec8
1 parent adefb74
commit 6bf2ec8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -2,6 +2,8 @@
 
 A feature to use the Pebble template engine with ktor. 
 
+**Note: Version 0.0.5 is for ktor 1.3+, Version 0.0.4 is for <= 1.2**
+
 ## Installation
 
 ### Add dependency to gradle
@@ -15,7 +17,7 @@ maven { url  "https://dl.bintray.com/jeffsmithdev/maven" }
 Include the artifact:
 
 ```groovy
-compile 'com.tlogx.ktor:ktor-pebble:0.0.4'
+compile 'com.tlogx.ktor:ktor-pebble:0.0.5'
 ```
 
 Install the feature in ktor with optional config:
@@ -56,6 +58,9 @@ routing {
 
 ## Releases
 
+**0.0.5**
+- Updated ktor to 1.3.0
+
 **0.0.4**
 - Updated kotlin (1.3.50), ktor (1.2.4) and pebble (3.1.0) - Thanks Richard Scorer
 

diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,8 @@
 buildscript {
     ext.kotlin_version = '1.3.50'
-    ext.ktor_version = '1.2.4'
+    ext.ktor_version = '1.3.0'
     ext.logback_version = '1.2.1'
-    ext.ktor_pebble_version = '0.0.4'
+    ext.ktor_pebble_version = '0.0.5'
 
     repositories {
         jcenter()

diff --git a/src/main/kotlin/com/tlogx/ktor/pebble/Pebble.kt b/src/main/kotlin/com/tlogx/ktor/pebble/Pebble.kt
@@ -14,7 +14,7 @@ import io.ktor.response.ApplicationSendPipeline
 import io.ktor.util.AttributeKey
 import io.ktor.util.KtorExperimentalAPI
 import io.ktor.util.cio.bufferedWriter
-import kotlinx.coroutines.io.ByteWriteChannel
+import io.ktor.utils.io.ByteWriteChannel
 import java.util.*
 
 

diff --git a/src/test/kotlin/com/tlogx/ktor/pebble/PebbleTest.kt b/src/test/kotlin/com/tlogx/ktor/pebble/PebbleTest.kt
@@ -51,7 +51,7 @@ class PebbleTest {
                 assert(response.content!!.contains(validListItem))
                 val contentTypeText = assertNotNull(response.headers[HttpHeaders.ContentType])
                 assertEquals(ContentType.Text.Html.withCharset(Charsets.UTF_8), ContentType.parse(contentTypeText))
-                assertEquals("e", response.headers[HttpHeaders.ETag])
+                assertEquals("\"e\"", response.headers[HttpHeaders.ETag])
             }
         }
     }
@@ -101,7 +101,7 @@ class PebbleTest {
                 assert(content.contains("<li>Brownie</li>"))
                 val contentTypeText = assertNotNull(response.headers[HttpHeaders.ContentType])
                 assertEquals(ContentType.Text.Html.withCharset(Charsets.UTF_8), ContentType.parse(contentTypeText))
-                assertEquals("e", response.headers[HttpHeaders.ETag])
+                assertEquals("\"e\"", response.headers[HttpHeaders.ETag])
             }
         }
     }