Merge pull request #11 from tuarua/development

1.1.0
tuarua · Apr 19, 2019 · bdab71b · bdab71b
2 parents c0ef349 + 82a621b
commit bdab71b
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 110 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.1.0
+- Upgraded to AIR 32.0.0.116
+- iOS/OSX/tvOS: Updated to FreSwift 3.1.0
+
 ### 1.0.0
 - Updated to FreSwift 3.0.0
 - Updated to AIR 32

diff --git a/example-desktop/get_dependencies.sh b/example-desktop/get_dependencies.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-AneVersion="1.0.0"
-FreSwiftVersion="3.0.0"
+AneVersion="1.1.0"
+FreSwiftVersion="3.1.0"
 
 wget -O ../native_extension/ane/FreSwift.ane https://github.com/tuarua/Swift-IOS-ANE/releases/download/$FreSwiftVersion/FreSwift.ane?raw=true
 wget -O ../native_extension/ane/MLANE.ane https://github.com/tuarua/ML-ANE/releases/download/$AneVersion/MLANE.ane?raw=true
diff --git a/example-mobile/get_ios_dependencies.sh b/example-mobile/get_ios_dependencies.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-AneVersion="1.0.0"
-FreSwiftVersion="3.0.0"
+AneVersion="1.1.0"
+FreSwiftVersion="3.1.0"
 
 rm -r ios_dependencies/device
 rm -r ios_dependencies/simulator

diff --git a/example-tvos/get_tvos_dependencies.sh b/example-tvos/get_tvos_dependencies.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-AneVersion="1.0.0"
-FreSwiftVersion="3.0.0"
+AneVersion="1.1.0"
+FreSwiftVersion="3.1.0"
 
 rm -r tvos_dependencies/device
 rm -r tvos_dependencies/simulator

diff --git a/native_extension/ane/extension.xml b/native_extension/ane/extension.xml
@@ -3,7 +3,7 @@
     <id>com.tuarua.MLANE</id>
 	<name>Machine Learning ANE</name>
 	<copyright>This work is licensed under Apache License, Copyright (c) 2018 Tua Rua Ltd.</copyright>
-	<versionNumber>1.0.0</versionNumber>
+	<versionNumber>1.1.0</versionNumber>
     <platforms>
      <platform name="iPhone-ARM">
         <applicationDeployment>

diff --git a/native_extension/bin/MLANE.swc b/native_extension/bin/MLANE.swc
diff --git a/native_extension/src/com/tuarua/utils/GUID.as b/native_extension/src/com/tuarua/utils/GUID.as
diff --git a/native_library/apple/MLANE/Cartfile b/native_library/apple/MLANE/Cartfile
@@ -1 +1 @@
-binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/3.0.0/FreSwift.json" ~> 3.0.0
+binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/3.1.0/FreSwift.json" ~> 3.1.0
diff --git a/native_library/apple/MLANE/MLANE/CoreMlController.swift b/native_library/apple/MLANE/MLANE/CoreMlController.swift
@@ -23,7 +23,7 @@ import AVFoundation
 class CoreMlController: NSObject, FreSwiftController {
     static var TAG: String = "CoreMlController"
     var context: FreContextSwift!
-    internal var models: [String: MLModel] = [:]
+    internal var models = [String: MLModel]()
     internal let userInitiatedQueue = DispatchQueue(label: "com.tuarua.mlane.userInitiatedQueue", qos: .userInitiated)
 #if os(iOS)
     internal lazy var captureSession = AVCaptureSession()

diff --git a/native_library/apple/MLANE/MLANE/SwiftController.swift b/native_library/apple/MLANE/MLANE/SwiftController.swift
@@ -185,7 +185,7 @@ public class SwiftController: NSObject {
             else {
                 return FreArgError(message: "inputFromCamera").getError(#file, #line, #column)
         }
-        var mask: CGImage? = nil
+        var mask: CGImage?
         if let freMask = argv[1] {
             let asBitmapData = FreBitmapDataSwift(freObject: freMask)
             defer {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/3.0.0/FreSwift.json" ~> 3.0.0
		binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/3.1.0/FreSwift.json" ~> 3.1.0