Skip to content

Commit

Permalink
Merge pull request #22 from inaka/ramabit.kotlin.1.0.0
Browse files Browse the repository at this point in the history
Ramabit.kotlin.1.0.0
  • Loading branch information
tenmaster committed Feb 25, 2016
2 parents fdb3b14 + e02b874 commit e8a2ba4
Show file tree
Hide file tree
Showing 8 changed files with 3 additions and 21 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
}
dependencies {
// Kotlin is not working well with com.android.tools.build:gradle:2.0.0-alpha5
classpath 'com.android.tools.build:gradle:1.5.0'
classpath 'com.android.tools.build:gradle:2.0.0-beta5'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
}
}
Expand Down
4 changes: 2 additions & 2 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ android {
}

buildscript {
ext.kotlin_version = '1.0.0-beta-4584'
ext.kotlin_version = '1.0.0'
repositories {
mavenCentral()
maven {
Expand All @@ -42,7 +42,7 @@ buildscript {
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
classpath 'com.android.tools.build:gradle:1.1.0'
classpath 'com.android.tools.build:gradle:2.0.0-beta5'

}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
import android.test.UiThreadTest;


/**
* Created by inaka on 1/20/16.
*/
public class BlocksInsideTest extends AndroidTestCase {

@UiThreadTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
import android.test.UiThreadTest;


/**
* Created by inaka on 1/21/16.
*/
public class RefactorBlocksTest extends AndroidTestCase {

@UiThreadTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ package com.inaka.killertask
import android.util.Log
import java.util.concurrent.CountDownLatch

/**
* Created by inaka on 1/20/16.
*/
private class ExampleBlocksInside {
val signal = CountDownLatch(1);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ import java.net.URL
import java.net.URLConnection
import java.util.concurrent.CountDownLatch

/**
* Created by inaka on 1/21/16.
*/
private class ExampleBlocksRefactor {
val signal = CountDownLatch(1);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ import android.util.Log
import java.util.concurrent.CountDownLatch
import java.util.concurrent.TimeUnit

/**
* Created by inaka on 1/22/16.
*/
private class ExampleVariableParametersTasks {

val signal = CountDownLatch(1);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ package com.inaka.killertask

import org.junit.Test

/**
* Created by inaka on 1/19/16.
*/
class KillerMainTest_KotlinVersion {
@Test
fun createKillerTask() {
Expand Down

0 comments on commit e8a2ba4

Please sign in to comment.