Merge pull request #143 from snipsco/release/0.64.8

adrienball · web-flow · commit 12f3e3ba61a2 · 2019-07-10T14:35:04.000+02:00
Release 0.64.8
diff --git a/.travis.yml b/.travis.yml
@@ -1,16 +1,18 @@
-language: rust
-
 env:
   global:
   - RUST_BACKTRACE=1
 
-matrix:
+jobs:
     include:
-    - rust: stable
+    - language: java
+      jdk: openjdk8
       env: KOTLIN_TESTS=true
-    - rust: beta
-    - rust: nightly
+    - language: rust
+      rust: beta
+    - language: rust
+      rust: nightly
     allow_failures:
-    - rust: nightly
+    - language: rust
+      rust: nightly
 
 script: ".travis/travis.sh"
diff --git a/.travis/travis.sh b/.travis/travis.sh
@@ -1,6 +1,13 @@
 #!/bin/bash
 set -ev
 
+# Install Rust
+if [[ -z ${TRAVIS_RUST_VERSION+w} ]]; then
+  curl https://sh.rustup.rs -sSf | bash -s -- -y
+fi
+
+export PATH="$HOME/.cargo/bin:$PATH"
+
 cargo build --all
 cargo test --all
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.64.8] - 2019-07-10
+### Fixed
+- Fix issue with libc and `Send` trait
+
 ## [0.64.7] - 2019-06-18
 ### Fixed
 - Portuguese builtin entity examples
@@ -175,6 +179,7 @@ All notable changes to this project will be documented in this file.
 ### Changed
 - Updated Rustling ontology to `0.16.4`
 
+[0.64.8]: https://github.com/snipsco/snips-nlu-ontology/compare/0.64.7...0.64.8
 [0.64.7]: https://github.com/snipsco/snips-nlu-ontology/compare/0.64.6...0.64.7
 [0.64.6]: https://github.com/snipsco/snips-nlu-ontology/compare/0.64.5...0.64.6
 [0.64.5]: https://github.com/snipsco/snips-nlu-ontology/compare/0.64.4...0.64.5
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "snips-nlu-ontology"
-version = "0.64.7"
+version = "0.64.8"
 authors = [
     "Adrien Ball <adrien.ball@snips.ai>",
     "Thibaut Lorrain <thibaut.lorrain@snips.ai>",
diff --git a/README.rst b/README.rst
@@ -1,7 +1,7 @@
 Snips NLU Ontology
 ==================
 
-.. image:: https://travis-ci.org/snipsco/snips-nlu-ontology.svg?branch=develop
+.. image:: https://travis-ci.org/snipsco/snips-nlu-ontology.svg?branch=master
    :target: https://travis-ci.org/snipsco/snips-nlu-ontology
 
 Ontology of the Snips NLU library API which describes supported languages and builtin entities.
diff --git a/doc/Cargo.toml b/doc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "snips-nlu-ontology-doc"
-version = "0.64.7"
+version = "0.64.8"
 authors = ["Adrien Ball <adrien.ball@snips.ai>"]
 edition = "2018"
 
diff --git a/doc/build.rs b/doc/build.rs
@@ -27,7 +27,7 @@ fn add_header(readme: &mut String) {
     readme.push_str("\n");
 
     readme.push_str(
-        ".. image:: https://travis-ci.org/snipsco/snips-nlu-ontology.svg?branch=develop\n",
+        ".. image:: https://travis-ci.org/snipsco/snips-nlu-ontology.svg?branch=master\n",
     );
     readme.push_str("   :target: https://travis-ci.org/snipsco/snips-nlu-ontology\n");
     readme.push_str("\n");
diff --git a/ffi/Cargo.toml b/ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "snips-nlu-ontology-ffi"
-version = "0.64.7"
+version = "0.64.8"
 authors = ["Kevin Lefevre <kevin.lefevre@snips.ai>"]
 edition = "2018"
 
diff --git a/ffi/ffi-macros/Cargo.toml b/ffi/ffi-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "snips-nlu-ontology-ffi-macros"
-version = "0.64.7"
+version = "0.64.8"
 authors = [
     "Kevin Lefevre <kevin.lefevre@snips.ai>",
     "Thibaut Lorrain <thibaut.lorrain@snips.ai>",
diff --git a/ffi/ffi-macros/src/builtin_entity.rs b/ffi/ffi-macros/src/builtin_entity.rs
@@ -78,8 +78,10 @@ impl Drop for CBuiltinEntityArray {
 // ffi's type `*const libc::c_char` isn't
 struct DummyWrapper(Box<[*const libc::c_char]>);
 
+unsafe impl Send for DummyWrapper {}
 unsafe impl Sync for DummyWrapper {}
 
+
 pub fn all_builtin_entities() -> CStringArray {
     lazy_static! {
         static ref ALL: DummyWrapper = {
diff --git a/ffi/ffi-macros/src/language.rs b/ffi/ffi-macros/src/language.rs
@@ -9,6 +9,7 @@ use snips_nlu_ontology::Language;
 // ffi's type `*const libc::c_char` isn't
 struct DummyWrapper(Box<[*const libc::c_char]>);
 
+unsafe impl Send for DummyWrapper {}
 unsafe impl Sync for DummyWrapper {}
 
 pub fn supported_languages() -> CStringArray {
diff --git a/platforms/kotlin/build.gradle b/platforms/kotlin/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 }
 
-version = "0.64.7"
+version = "0.64.8"
 group = "ai.snips"
 
 
diff --git a/platforms/kotlin/snips-nlu-ontology-export/build.gradle b/platforms/kotlin/snips-nlu-ontology-export/build.gradle
@@ -1,4 +1,4 @@
-version = "0.64.7"
+version = "0.64.8"
 group = "ai.snips"
 
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ buildscript {`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`
`11`		`-version = "0.64.7"`
	`11`	`+version = "0.64.8"`
`12`	`12`	`group = "ai.snips"`
`13`	`13`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version = "0.64.7"`
	`1`	`+version = "0.64.8"`
`2`	`2`	`group = "ai.snips"`
`3`	`3`
`4`	`4`