Added PhysicalUnit typealias to avoid confusion and import ambiguity

with kotlin.Unit.
Tenkiv · Sep 11, 2017 · ce7f221 · ce7f221
1 parent 3c1ddac
commit ce7f221
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/complete-units/build.gradle b/complete-units/build.gradle
@@ -22,7 +22,7 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 group 'org.tenkiv.physikal'
-version '1.0.1.1'
+version '1.0.2.1'
 
 buildscript {
     ext.kotlin_version = '1.1.4-3'

diff --git a/core/build.gradle b/core/build.gradle
@@ -22,7 +22,7 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 group 'org.tenkiv.physikal'
-version '1.0.1.1'
+version '1.0.2.1'
 
 apply plugin: 'kotlin'
 

diff --git a/core/src/main/kotlin/org/tenkiv/physikal/core/Type.kt b/core/src/main/kotlin/org/tenkiv/physikal/core/Type.kt
@@ -30,9 +30,11 @@ import javax.measure.Unit
 
 // typealiases
 typealias ClosedQuantityRange<Q> = ClosedRange<ComparableQuantity<Q>>
+// Unit type alias to avoid confusion and import ambiguity with kotlin.Unit
+typealias PhysicalUnit<Q> = Unit<Q>
 
 // Unit extensions
-inline fun <reified Q : Quantity<Q>> Unit<*>.asType(): Unit<Q> = asType(Q::class.java)
+inline fun <reified Q : Quantity<Q>> PhysicalUnit<*>.asType(): PhysicalUnit<Q> = asType(Q::class.java)
 
 // Quantity extensions
 /**

diff --git a/si-units/build.gradle b/si-units/build.gradle
@@ -22,7 +22,7 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 group 'org.tenkiv.physikal'
-version '1.0.1.1'
+version '1.0.2.1'
 
 buildscript {
     ext.kotlin_version = '1.1.4-3'