Upgrade Kotlin plugin

Author: StephenVinouze

build.gradle

@@ -1,13 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.30'
+    ext.kotlin_version = '1.2.60'
     repositories {
         jcenter()
         maven { url 'https://maven.google.com' }
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.4'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }

core/build.gradle

@@ -2,7 +2,7 @@ apply from: '../library.gradle'
 apply plugin: 'kotlin-android'
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation 'junit:junit:4.12'
 }

core/src/main/java/com/github/stephenvinouze/materialnumberpickercore/MaterialNumberPicker.kt

@@ -156,10 +156,10 @@ class MaterialNumberPicker : NumberPicker {
      */
     private fun updateTextAttributes() {
         val typeface = if (fontName != null) Typeface.createFromAsset(context.assets, "fonts/$fontName") else Typeface.create(Typeface.DEFAULT, textStyle)
-        wheelPaint?.let {
-            it.color = textColor
-            it.textSize = textSize.toFloat()
-            it.typeface = typeface
+        wheelPaint?.let { paint ->
+            paint.color = textColor
+            paint.textSize = textSize.toFloat()
+            paint.typeface = typeface
 
             val childEditText = (0 until childCount).map { getChildAt(it) as? EditText }.firstOrNull()
             childEditText?.let {

gradle.properties

@@ -24,7 +24,7 @@ PACKAGING=aar
 ANDROID_MIN_SDK_VERSION=11
 ANDROID_BUILD_SDK_VERSION=27
 ANDROID_BUILD_TOOLS_VERSION=27.0.3
-ANDROID_APPCOMPAT_VERSION=27.1.0
+ANDROID_APPCOMPAT_VERSION=27.1.1
 
 POM_NAME=MaterialNumberPicker
 POM_REPO=maven

javasample/build.gradle

@@ -20,9 +20,9 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile project(':core')
-    testCompile 'junit:junit:4.12'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(':core')
+    testImplementation 'junit:junit:4.12'
 
-    compile "com.android.support:appcompat-v7:$ANDROID_APPCOMPAT_VERSION"
+    implementation "com.android.support:appcompat-v7:$ANDROID_APPCOMPAT_VERSION"
 }

sample/build.gradle

@@ -21,9 +21,10 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile project(':core')
-    testCompile 'junit:junit:4.12'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(':core')
+    testImplementation 'junit:junit:4.12'
 
-    compile "com.android.support:appcompat-v7:$ANDROID_APPCOMPAT_VERSION"
+    implementation "com.android.support:appcompat-v7:$ANDROID_APPCOMPAT_VERSION"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }

sample/src/main/java/com/github/stephenvinouze/materialnumberpickersample/MainActivity.kt

@@ -47,8 +47,8 @@ class MainActivity : AppCompatActivity() {
                     editable = false,
                     wrapped = false,
                     fontName = "Hand.ttf",
-                    formatter = NumberPicker.Formatter {
-                        return@Formatter "Value $it"
+                    formatter = NumberPicker.Formatter {value ->
+                        return@Formatter "Value $value"
                     }
             )
             presentPickerInAlert(numberPicker, getString(R.string.alert_custom_title))
@@ -60,9 +60,9 @@ class MainActivity : AppCompatActivity() {
                 .setTitle(title)
                 .setView(numberPicker)
                 .setNegativeButton(getString(android.R.string.cancel), null)
-                .setPositiveButton(getString(android.R.string.ok), { _, _ ->
+                .setPositiveButton(getString(android.R.string.ok)) { _, _ ->
                     Toast.makeText(this, getString(R.string.picker_value, numberPicker.value), Toast.LENGTH_LONG).show()
-                })
+                }
                 .show()
     }