new kotlin version

yoavst · May 29, 2015 · 4d3c0ee · 4d3c0ee
1 parent 6c168ab
commit 4d3c0ee
Show file tree

Hide file tree

Showing 27 changed files with 5 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ repositories {
 **Step 2. Add the dependency in the form**
 ```groovy
 dependencies {
-	        compile 'com.github.yoavst:androidKotlin:1.0.6'
+	        compile 'com.github.yoavst:androidKotlin:1.5'
 	}
 ```
 

diff --git a/app/.gitignore b/app/.gitignore
diff --git a/app/build.gradle b/app/build.gradle
@@ -24,6 +24,6 @@ android {
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    compile 'com.android.support:support-v4:22.0.0'
+    compile "org.jetbrains.kotlin:kotlin-stdlib:0.12.200"
+    compile 'com.android.support:support-v4:22.2.0'
 }
diff --git a/app/gradle.properties b/app/gradle.properties
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
diff --git a/app/src/main/kotlin/com/yoavst/kotlin/Api.kt b/app/src/main/kotlin/com/yoavst/kotlin/Api.kt
diff --git a/app/src/main/kotlin/com/yoavst/kotlin/BroadcastReceiver.kt b/app/src/main/kotlin/com/yoavst/kotlin/BroadcastReceiver.kt
diff --git a/app/src/main/kotlin/com/yoavst/kotlin/Bundle.kt b/app/src/main/kotlin/com/yoavst/kotlin/Bundle.kt
diff --git a/app/src/main/kotlin/com/yoavst/kotlin/Handler.kt b/app/src/main/kotlin/com/yoavst/kotlin/Handler.kt
diff --git a/app/src/main/kotlin/com/yoavst/kotlin/IntentFilter.kt b/app/src/main/kotlin/com/yoavst/kotlin/IntentFilter.kt
diff --git a/app/src/main/kotlin/com/yoavst/kotlin/Intents.kt b/app/src/main/kotlin/com/yoavst/kotlin/Intents.kt
diff --git a/app/src/main/kotlin/com/yoavst/kotlin/Layout.kt b/app/src/main/kotlin/com/yoavst/kotlin/Layout.kt
diff --git a/app/src/main/kotlin/com/yoavst/kotlin/Log.kt b/app/src/main/kotlin/com/yoavst/kotlin/Log.kt
diff --git a/app/src/main/kotlin/com/yoavst/kotlin/Preferences.kt b/app/src/main/kotlin/com/yoavst/kotlin/Preferences.kt
diff --git a/app/src/main/kotlin/com/yoavst/kotlin/Resources.kt b/app/src/main/kotlin/com/yoavst/kotlin/Resources.kt
diff --git a/app/src/main/kotlin/com/yoavst/kotlin/ResourcesDelegate.kt b/app/src/main/kotlin/com/yoavst/kotlin/ResourcesDelegate.kt
diff --git a/app/src/main/kotlin/com/yoavst/kotlin/SystemServices.kt b/app/src/main/kotlin/com/yoavst/kotlin/SystemServices.kt
diff --git a/app/src/main/kotlin/com/yoavst/kotlin/Tasks.kt b/app/src/main/kotlin/com/yoavst/kotlin/Tasks.kt
diff --git a/app/src/main/kotlin/com/yoavst/kotlin/Toasts.kt b/app/src/main/kotlin/com/yoavst/kotlin/Toasts.kt
diff --git a/app/src/main/kotlin/com/yoavst/kotlin/View.kt b/app/src/main/kotlin/com/yoavst/kotlin/View.kt
diff --git a/build.gradle b/build.gradle
@@ -5,8 +5,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:0.12.200"
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -16,5 +16,4 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-kotlin_version=0.11.91
 
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/settings.gradle b/settings.gradle