Merge pull request #1 from ebayraktar/feature/kotlin

Converted FadingTextView file from Java to Kotlin
ebayraktar · May 30, 2023 · 09ecc4c · 09ecc4c
2 parents 0b45bff + 12e973d
commit 09ecc4c
Show file tree

Hide file tree

Showing 6 changed files with 207 additions and 363 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 32
-    buildToolsVersion '26.0.3'
+    namespace 'com.tomerrosenfeld.fadingtextview'
+    compileSdk 32
     defaultConfig {
         applicationId "com.tomerrosenfeld.fadingtextview"
         minSdkVersion 27
@@ -25,7 +25,7 @@ android {
 }
 
 dependencies {
-    androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     implementation project(':fadingtextview')

diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext {
+        kotlin_version = '1.8.21'
+    }
     repositories {
         jcenter()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
     }
@@ -22,6 +26,6 @@ allprojects {
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
diff --git a/fadingtextview/build.gradle b/fadingtextview/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.library'
+apply plugin: 'org.jetbrains.kotlin.android'
 
 ext {
     bintrayRepo = 'maven'
@@ -25,8 +26,8 @@ ext {
 }
 
 android {
-    compileSdkVersion 32
-    buildToolsVersion "26.0.3"
+    namespace 'com.tomer.fadingtextview'
+    compileSdk 32
 
     defaultConfig {
         minSdkVersion 14
@@ -47,6 +48,5 @@ dependencies {
     testImplementation 'junit:junit:4.12'
 }
 
-apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
-apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'
-
+//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' // deprecated
+//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle' // deprecated