Skip to content
This repository has been archived by the owner on Jul 8, 2022. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Update to kotlin 1.2.0-beta-88 (#1)
* Reorganized project folders

* Update to kotlin 1.2.0-beta-88
  • Loading branch information
soywiz committed Oct 19, 2017
1 parent 657f1ae commit c19a407
Show file tree
Hide file tree
Showing 137 changed files with 52 additions and 46 deletions.
46 changes: 21 additions & 25 deletions build.gradle
@@ -1,36 +1,18 @@
buildscript {
ext.kotlinVersion = '1.2.0-beta-31'
ext.kotlinVersion = '1.2.0-beta-88'
ext.compilerVersion = ext.kotlinVersion
ext.librariesVersion = ext.kotlinVersion
//ext.eapChannel = 'https://dl.bintray.com/kotlin/kotlin-eap-1.1'
ext.eapChannel = 'http://dl.bintray.com/kotlin/kotlin-eap-1.2'
ext.serializationRepo = 'https://kotlin.bintray.com/kotlinx'
ext.serializationPluginVersion = '0.1'

repositories {
mavenLocal()
jcenter()
maven { url serializationRepo }
maven { url eapChannel }
}

dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$compilerVersion"
}

ext {
libraries = [
kotlin_stdlib_common: "org.jetbrains.kotlin:kotlin-stdlib-common:$librariesVersion",
kotlin_stdlib_jvm : "org.jetbrains.kotlin:kotlin-stdlib:$librariesVersion",
kotlin_stdlib_js : "org.jetbrains.kotlin:kotlin-stdlib-js:$librariesVersion",

kotlin_test_common : "org.jetbrains.kotlin:kotlin-test-common:$librariesVersion",
kotlin_test_jvm : "org.jetbrains.kotlin:kotlin-test:$librariesVersion",
kotlin_test_js : "org.jetbrains.kotlin:kotlin-test-js:$librariesVersion",

kotlin_reflect : "org.jetbrains.kotlin:kotlin-reflect:$librariesVersion",
]
}
}

configurations {
Expand Down Expand Up @@ -60,8 +42,9 @@ allprojects {
it.afterEvaluate {
if (it.plugins.hasPlugin("kotlin-platform-common")) {
dependencies {
compile libraries.kotlin_stdlib_common
testCompile libraries.kotlin_test_common
compile "org.jetbrains.kotlin:kotlin-stdlib-common:$librariesVersion"
testCompile "org.jetbrains.kotlin:kotlin-test-common:$librariesVersion"
testCompile "org.jetbrains.kotlin:kotlin-test-annotations-common:$librariesVersion"
}

kotlin {
Expand All @@ -70,19 +53,27 @@ allprojects {
}
if (it.plugins.hasPlugin("kotlin-platform-jvm") || it.plugins.hasPlugin("kotlin")) {
dependencies {
compile libraries.kotlin_stdlib_jvm
testCompile libraries.kotlin_test_jvm
compile "org.jetbrains.kotlin:kotlin-stdlib:$librariesVersion"
testCompile "org.jetbrains.kotlin:kotlin-test:$librariesVersion"
testCompile "org.jetbrains.kotlin:kotlin-test-junit:$librariesVersion"
testCompile "junit:junit:4.12"
}

kotlin {
experimental { coroutines 'enable' }
}

compileJava.options.encoding = 'UTF-8'
compileTestJava.options.encoding = 'UTF-8'

sourceCompatibility = 1.7
targetCompatibility = 1.7
}
if (it.plugins.hasPlugin("kotlin-platform-js") || it.plugins.hasPlugin("kotlin2js")) {
dependencies {
compile libraries.kotlin_stdlib_js
testCompile libraries.kotlin_test_js
compile "org.jetbrains.kotlin:kotlin-stdlib-js:$librariesVersion"
testCompile "org.jetbrains.kotlin:kotlin-test-js:$librariesVersion"
testCompile "org.jetbrains.kotlin:kotlin-test-js:$librariesVersion"
}

kotlin {
Expand All @@ -93,6 +84,11 @@ allprojects {
kotlinOptions.moduleKind = "umd"
kotlinOptions.sourceMap = true
}

compileTestKotlin2Js {
kotlinOptions.moduleKind = "umd"
kotlinOptions.sourceMap = true
}
}
}

Expand Down
3 changes: 1 addition & 2 deletions gradle.properties
@@ -1,2 +1 @@
korVersion=0.14.0
kotlinVersion=1.2.0-beta-31
korVersion=0.14.0
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
#Sun Aug 27 17:46:49 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip
6 changes: 3 additions & 3 deletions gradlew
Expand Up @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn ( ) {
warn () {
echo "$*"
}

die ( ) {
die () {
echo
echo "$*"
echo
Expand Down Expand Up @@ -155,7 +155,7 @@ if $cygwin ; then
fi

# Escape application args
save ( ) {
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion korim-android/build.gradle → korim/android/build.gradle
@@ -1,7 +1,7 @@
apply plugin: 'kotlin-platform-jvm'

dependencies {
implement project(":korim-common")
expectedBy project(":korim-common")

compile "com.soywiz:korio-android:$korVersion"
compile "com.soywiz:korma-android:$korVersion"
Expand Down
File renamed without changes.
File renamed without changes.
@@ -1,7 +1,8 @@
package com.soywiz.korim.color

import com.soywiz.korim.bitmap.Bitmap32
import com.soywiz.korio.lang.JvmStatic
import com.soywiz.korio.JvmStatic
import com.soywiz.korio.Language
import com.soywiz.korio.util.*
import kotlin.math.min

Expand Down Expand Up @@ -56,6 +57,14 @@ abstract class ColorFormat(val bpp: Int) : ColorFormatBase {
this.getR(color), this.getG(color), this.getB(color), this.getA(color)
)

fun demo(@Language("html") html: String) {

}

fun test() {
demo("<html></html>")
}

companion object {
@JvmStatic
fun clamp0_FF(v: Int) = if (v < 0x00) 0x00 else if (v > 0xFF) 0xFF else v
Expand Down
@@ -1,6 +1,6 @@
package com.soywiz.korim.color

import com.soywiz.korio.lang.Transient
import com.soywiz.korio.Transient
import com.soywiz.korio.util.clamp
import com.soywiz.korma.interpolation.Interpolable
import com.soywiz.korma.interpolation.MutableInterpolable
Expand Down
@@ -1,7 +1,7 @@
package com.soywiz.korim.color

import com.soywiz.korio.JvmField
import com.soywiz.korio.error.invalidOp
import com.soywiz.korio.lang.JvmField
import com.soywiz.korio.util.substr

object Colors {
Expand Down
@@ -1,6 +1,6 @@
package com.soywiz.korim.color

import com.soywiz.korio.lang.JvmStatic
import com.soywiz.korio.JvmStatic
import com.soywiz.korio.lang.format
import com.soywiz.korio.util.clamp

Expand Down
@@ -1,6 +1,6 @@
package com.soywiz.korim.color

import com.soywiz.korio.lang.JvmField
import com.soywiz.korio.JvmField

class RGBAd(
@JvmField var r: Double,
Expand Down
@@ -1,8 +1,8 @@
package com.soywiz.korim.color

import com.soywiz.korio.JvmStatic
import com.soywiz.korio.util.extract8
import com.soywiz.korio.util.insert8
import com.soywiz.korio.lang.JvmStatic

// https://en.wikipedia.org/wiki/YUV
object YUVA : ColorFormat32() {
Expand Down
Expand Up @@ -2,8 +2,8 @@ package com.soywiz.korim.format

import com.soywiz.korim.bitmap.Bitmap32
import com.soywiz.korim.color.YUVA
import com.soywiz.korio.lang.EOFException
import com.soywiz.korio.lang.IOException
import com.soywiz.korio.EOFException
import com.soywiz.korio.IOException
import com.soywiz.korio.stream.SyncInputStream
import com.soywiz.korio.stream.SyncStream
import com.soywiz.korio.stream.openSync
Expand Down
Expand Up @@ -219,7 +219,7 @@ fun Context2d.Paint.toSvg(svg: SvgBuilder): String {
"width" to "${bitmap.width}",
"height" to "${bitmap.height}"
),
listOf()
listOf<Xml>()
)
))
return "url(#def$id)"
Expand Down
File renamed without changes.
4 changes: 1 addition & 3 deletions korim-js/build.gradle → korim/js/build.gradle
@@ -1,10 +1,8 @@
apply plugin: 'kotlin-platform-js'

dependencies {
implement project(":korim-common")
expectedBy project(":korim-common")

compile "com.soywiz:korio-js:$korVersion"
compile "com.soywiz:korma-js:$korVersion"

testCompile libraries.kotlin_test_js
}
File renamed without changes.
2 changes: 1 addition & 1 deletion korim/build.gradle → korim/jvm/build.gradle
@@ -1,7 +1,7 @@
apply plugin: 'kotlin-platform-jvm'

dependencies {
implement project(":korim-common")
expectedBy project(":korim-common")
testImplementation project(":korim-common")

compile "com.soywiz:korio:$korVersion"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
5 changes: 5 additions & 0 deletions settings.gradle
Expand Up @@ -5,3 +5,8 @@ include(
'korim',
'korim-android',
)

project(':korim-common').projectDir = file('korim/common')
project(':korim').projectDir = file('korim/jvm')
project(':korim-android').projectDir = file('korim/android')
project(':korim-js').projectDir = file('korim/js')

0 comments on commit c19a407

Please sign in to comment.