Skip to content

Commit

Permalink
This time really use Kotlin RC
Browse files Browse the repository at this point in the history
  silly me!
  • Loading branch information
superbobry committed Feb 3, 2016
1 parent d247aa6 commit 60ac317
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 27 deletions.
4 changes: 3 additions & 1 deletion CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
18 changes: 4 additions & 14 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,33 +1,31 @@
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"
}
}

plugins {
id 'com.jfrog.bintray' version '1.2'
}

apply plugin: 'org.jetbrains.dokka'
apply plugin: 'kotlin'
apply plugin: 'maven-publish'

repositories {
jcenter()

maven {
url 'http://oss.sonatype.org/content/repositories/snapshots'
url 'https://dl.bintray.com/kotlin/kotlin-eap'
}
}

Expand All @@ -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
Expand Down Expand Up @@ -89,5 +79,5 @@ bintray {
}

task wrapper(type: Wrapper) {
gradleVersion = '2.5'
gradleVersion = '2.10'
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
10 changes: 3 additions & 7 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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

Expand Down Expand Up @@ -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`
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/org/jetbrains/bio/viktor/StridedMagic.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
2 changes: 1 addition & 1 deletion src/main/kotlin/org/jetbrains/bio/viktor/StridedVector.kt
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ open class StridedVector internal constructor(
* @param reverse see [.sort] for details.
*/
fun argSort(reverse: Boolean = false): IntArray {
val comparator = comparator<IndexedDoubleValue> { x, y -> x.compareTo(y) }
val comparator = Comparator<IndexedDoubleValue> { x, y -> x.compareTo(y) }

val indexedValues = Array(size) { IndexedDoubleValue(it, unsafeGet(it)) }
indexedValues.sortWith(if (reverse) comparator.reversed() else comparator)
Expand Down

0 comments on commit 60ac317

Please sign in to comment.