diff --git a/CHANGES b/CHANGES index f6af4e1..0d194d9 100644 --- a/CHANGES +++ b/CHANGES @@ -6,13 +6,15 @@ Here you can see the full list of changes between each viktor release. Version 0.1.4 ------------- +Technical release, released on February 3rd 2016 + +- Migrated to Kotlin 1.0.0-rc. Version 0.1.3 ------------- Technical release, released on February 1st 2016 -- Migrated to Kotlin 1.0.0-rc. - Renamed 'StridedVector#sorted' to '#argSort' to avoid confusion with the '#sorted' method on primitve arrays. diff --git a/README.md b/README.md index 535ebf7..6579781 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ repositories { } dependencies { - compile 'org.jetbrains.bio:viktor:0.1.3' + compile 'org.jetbrains.bio:viktor:0.1.4' compile files("$rootDir/lib/yeppp-bundle-1.0.jar") compile files("$rootDir/lib/simd.jar", diff --git a/build.gradle b/build.gradle index 8424704..31ed442 100644 --- a/build.gradle +++ b/build.gradle @@ -1,17 +1,16 @@ buildscript { - ext.kotlin_version = '1.0.0-beta-+' + ext.kotlin_version = '1.0.0-rc-+' repositories { jcenter() maven { - url 'http://oss.sonatype.org/content/repositories/snapshots' + url 'https://dl.bintray.com/kotlin/kotlin-eap' } } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.4" } } @@ -19,7 +18,6 @@ plugins { id 'com.jfrog.bintray' version '1.2' } -apply plugin: 'org.jetbrains.dokka' apply plugin: 'kotlin' apply plugin: 'maven-publish' @@ -27,7 +25,7 @@ repositories { jcenter() maven { - url 'http://oss.sonatype.org/content/repositories/snapshots' + url 'https://dl.bintray.com/kotlin/kotlin-eap' } } @@ -43,14 +41,6 @@ dependencies { testCompile 'junit:junit:4.+' } -dokka { - linkMapping { - dir = "src/main/kotlin" - url = "https://github.com/JetBrains-Research/viktor/blob/master/src/main/kotlin" - suffix = "#L" - } -} - task sourcesJar(type: Jar) { classifier = 'sources' from sourceSets.main.allSource @@ -89,5 +79,5 @@ bintray { } task wrapper(type: Wrapper) { - gradleVersion = '2.5' + gradleVersion = '2.10' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 30d399d..13372ae 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1407e9b..0ac0f63 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Nov 09 16:30:55 MSK 2015 +#Wed Feb 03 18:28:31 MSK 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip diff --git a/gradlew b/gradlew index 91a7e26..9d82f78 100755 --- a/gradlew +++ b/gradlew @@ -42,11 +42,6 @@ case "`uname`" in ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - # Attempt to set APP_HOME # Resolve links: $0 may be a link PRG="$0" @@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do fi done SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- +cd "`dirname \"$PRG\"`/" >/dev/null APP_HOME="`pwd -P`" -cd "$SAVED" >&- +cd "$SAVED" >/dev/null CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -114,6 +109,7 @@ fi if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` diff --git a/src/main/kotlin/org/jetbrains/bio/viktor/StridedMagic.kt b/src/main/kotlin/org/jetbrains/bio/viktor/StridedMagic.kt index 52b6771..cf85585 100644 --- a/src/main/kotlin/org/jetbrains/bio/viktor/StridedMagic.kt +++ b/src/main/kotlin/org/jetbrains/bio/viktor/StridedMagic.kt @@ -6,4 +6,4 @@ package org.jetbrains.bio.viktor * @since 0.1.1 Renamed to `_I` because all-underscore names are reserved * for internal use in Kotlin. */ -public object _I {} +object _I {} diff --git a/src/main/kotlin/org/jetbrains/bio/viktor/StridedVector.kt b/src/main/kotlin/org/jetbrains/bio/viktor/StridedVector.kt index ba8d123..088b740 100644 --- a/src/main/kotlin/org/jetbrains/bio/viktor/StridedVector.kt +++ b/src/main/kotlin/org/jetbrains/bio/viktor/StridedVector.kt @@ -140,7 +140,7 @@ open class StridedVector internal constructor( * @param reverse see [.sort] for details. */ fun argSort(reverse: Boolean = false): IntArray { - val comparator = comparator { x, y -> x.compareTo(y) } + val comparator = Comparator { x, y -> x.compareTo(y) } val indexedValues = Array(size) { IndexedDoubleValue(it, unsafeGet(it)) } indexedValues.sortWith(if (reverse) comparator.reversed() else comparator)