Skip to content

Commit

Permalink
Merge pull request #4 from gfx/kotlin_1_0_2
Browse files Browse the repository at this point in the history
upgrade Kotlin to v1.0.2
  • Loading branch information
gfx committed May 24, 2016
2 parents a86efd4 + 8f65acf commit 8252b2c
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 9 deletions.
16 changes: 8 additions & 8 deletions app/build.gradle
@@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = '1.0.1-2'
ext.kotlin_version = '1.0.2'
repositories {
jcenter()
mavenCentral()
Expand Down Expand Up @@ -49,14 +49,14 @@ kapt {
}

dependencies {
kapt 'com.github.gfx.android.orma:orma-processor:2.4.2'
compile 'com.github.gfx.android.orma:orma:2.4.2'
kapt 'com.android.databinding:compiler:2.0.0'
compile 'com.android.support:appcompat-v7:23.3.0'
compile 'com.android.support:cardview-v7:23.3.0'
compile 'com.android.support:design:23.3.0'
kapt 'com.github.gfx.android.orma:orma-processor:2.4.6'
compile 'com.github.gfx.android.orma:orma:2.4.6'
kapt 'com.android.databinding:compiler:2.1.0'
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.android.support:cardview-v7:23.4.0'
compile 'com.android.support:design:23.4.0'
compile 'com.jakewharton.threetenabp:threetenabp:1.0.3'
compile 'com.cookpad.android.rxt4a:rxt4a:1.0.0'
compile 'com.facebook.stetho:stetho:1.3.0'
compile 'com.facebook.stetho:stetho:1.3.1'
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}
@@ -0,0 +1,7 @@
package com.github.gfx.android.orma_kotlin_example

/**
* Created by gfx on 2016/03/16.
*/
class Book {
}
2 changes: 1 addition & 1 deletion build.gradle
Expand Up @@ -3,7 +3,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.0.0'
classpath 'com.android.tools.build:gradle:2.1.0'
}
}

Expand Down

0 comments on commit 8252b2c

Please sign in to comment.