Merge pull request #76 from snipsco/release/0.57.2

Release 0.57.2
snipsco · Jul 13, 2018 · 8f39f85 · 8f39f85
2 parents d3ef4b1 + b6e4600
commit 8f39f85
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 14 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -49,3 +49,16 @@ after_test:
 artifacts:
   - path: platforms\snips-nlu-ontology-python\dist\*
     name: pypiartifacts
+
+for:
+-
+  branches:
+    only:
+      - master
+
+  environment:
+    matrix:
+    - PYTHON: "C:\\Python27"
+      TARGET: i686-pc-windows-msvc
+    - PYTHON: "C:\\Python36"
+      TARGET: i686-pc-windows-msvc
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.57.2] - 2018-07-13
+
+### Fixed
+- Kotlin ffi
+
 ## [0.57.1] - 2018-07-05
 
 ### Fixed
@@ -63,6 +68,7 @@ All notable changes to this project will be documented in this file.
 ### Changed
 - Updated Rustling ontology to `0.16.4`
 
+[0.57.1]: https://github.com/snipsco/snips-nlu-ontology/compare/0.57.1...0.57.2
 [0.57.1]: https://github.com/snipsco/snips-nlu-ontology/compare/0.57.0...0.57.1
 [0.57.0]: https://github.com/snipsco/snips-nlu-ontology/compare/0.56.1...0.57.0
 [0.56.1]: https://github.com/snipsco/snips-nlu-ontology/compare/0.56.0...0.56.1

diff --git a/platforms/snips-nlu-ontology-kotlin/build.gradle b/platforms/snips-nlu-ontology-kotlin/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 }
 
-version = "0.57.1"
+version = "0.57.2"
 group = "ai.snips"
 
 

diff --git a/platforms/snips-nlu-ontology-kotlin/snips-nlu-ontology-export/build.gradle b/platforms/snips-nlu-ontology-kotlin/snips-nlu-ontology-export/build.gradle
@@ -1,4 +1,4 @@
-version = "0.57.1"
+version = "0.57.2"
 group = "ai.snips"
 
 

diff --git a/...t/src/main/kotlin/com.sun.jna/JnaUtils.kt → ...t/src/main/kotlin/com/sun/jna/JnaUtils.kt b/...t/src/main/kotlin/com.sun.jna/JnaUtils.kt → ...t/src/main/kotlin/com/sun/jna/JnaUtils.kt
diff --git a/platforms/snips-nlu-ontology-kotlin/src/main/kotlin/ai/snips/nlu/ontology/ffi/COntology.kt b/platforms/snips-nlu-ontology-kotlin/src/main/kotlin/ai/snips/nlu/ontology/ffi/COntology.kt
@@ -24,6 +24,7 @@ import com.sun.jna.toJnaPointer
 const val RUST_ENCODING = "utf-8"
 
 fun Pointer?.readString(): String = this!!.getString(0, RUST_ENCODING)
+fun String.toPointer(): Pointer = this.toJnaPointer(RUST_ENCODING)
 fun Int?.readGrain(): Grain = CGrain.toGrain(this!!)
 fun Int?.readPrecision(): Precision = CPrecision.toPrecision(this!!)
 fun Int?.readRangeTo(end: Int?): Range? = if (this != -1) Range(this!!, end!!) else null

diff --git a/platforms/snips-nlu-ontology-python/snips-nlu-ontology-rs/Cargo.toml b/platforms/snips-nlu-ontology-python/snips-nlu-ontology-rs/Cargo.toml
@@ -1,16 +1,16 @@
 [package]
 name = "snips-nlu-ontology-rs"
-version = "0.57.1"
+version = "0.57.2"
 authors = ["Adrien Ball <adrien.ball@snips.ai>"]
 
 [dependencies]
 failure = "0.1"
 ffi-utils = { git = "https://github.com/snipsco/snips-utils-rs", rev = "b1f4af3" }
 lazy_static = "1.0"
 libc = "0.2"
-snips-nlu-ontology = { git = "https://github.com/snipsco/snips-nlu-ontology", tag = "0.57.1" }
-snips-nlu-ontology-ffi-macros = { git = "https://github.com/snipsco/snips-nlu-ontology", tag = "0.57.1" }
-snips-nlu-ontology-parsers-ffi-macros = { git = "https://github.com/snipsco/snips-nlu-ontology", tag = "0.57.1" }
+snips-nlu-ontology = { git = "https://github.com/snipsco/snips-nlu-ontology", branch = "develop" }
+snips-nlu-ontology-ffi-macros = { git = "https://github.com/snipsco/snips-nlu-ontology", branch = "develop" }
+snips-nlu-ontology-parsers-ffi-macros = { git = "https://github.com/snipsco/snips-nlu-ontology", branch = "develop" }
 
 [lib]
 name = "snips_nlu_ontology_rs"

diff --git a/platforms/snips-nlu-ontology-python/snips_nlu_ontology/__version__ b/platforms/snips-nlu-ontology-python/snips_nlu_ontology/__version__
@@ -1 +1 @@
-0.57.1
+0.57.2
diff --git a/snips-nlu-ontology-doc/Cargo.toml b/snips-nlu-ontology-doc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "snips-nlu-ontology-doc"
-version = "0.57.1"
+version = "0.57.2"
 authors = ["Adrien Ball <adrien.ball@snips.ai>"]
 
 [build-dependencies]

diff --git a/snips-nlu-ontology-ffi-macros/Cargo.toml b/snips-nlu-ontology-ffi-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "snips-nlu-ontology-ffi-macros"
-version = "0.57.1"
+version = "0.57.2"
 authors = [
     "Kevin Lefevre <kevin.lefevre@snips.ai>",
     "Thibaut Lorrain <thibaut.lorrain@snips.ai>",

diff --git a/snips-nlu-ontology-ffi-with-parsers/Cargo.toml b/snips-nlu-ontology-ffi-with-parsers/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "snips-nlu-ontology-ffi-with-parsers"
-version = "0.57.1"
+version = "0.57.2"
 authors = ["Kevin Lefevre <kevin.lefevre@snips.ai>"]
 
 [dependencies]

diff --git a/snips-nlu-ontology-ffi/Cargo.toml b/snips-nlu-ontology-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "snips-nlu-ontology-ffi"
-version = "0.57.1"
+version = "0.57.2"
 authors = ["Kevin Lefevre <kevin.lefevre@snips.ai>"]
 
 [dependencies]

diff --git a/snips-nlu-ontology-parsers-ffi-macros/Cargo.toml b/snips-nlu-ontology-parsers-ffi-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "snips-nlu-ontology-parsers-ffi-macros"
-version = "0.57.1"
+version = "0.57.2"
 authors = ["Kevin Lefevre <kevin.lefevre@snips.ai>"]
 
 [dependencies]

diff --git a/snips-nlu-ontology-parsers/Cargo.toml b/snips-nlu-ontology-parsers/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "snips-nlu-ontology-parsers"
-version = "0.57.1"
+version = "0.57.2"
 authors = ["Kevin Lefevre <kevin.lefevre@snips.ai>"]
 
 [dependencies]

diff --git a/snips-nlu-ontology/Cargo.toml b/snips-nlu-ontology/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "snips-nlu-ontology"
-version = "0.57.1"
+version = "0.57.2"
 authors = [
     "Adrien Ball <adrien.ball@snips.ai>",
     "Thibaut Lorrain <thibaut.lorrain@snips.ai>",
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ buildscript { @@
         }
     }
-    version = "0.57.1"
+    version = "0.57.2"
     group = "ai.snips"
@@ Expand Down @@