Skip to content

Commit

Permalink
Merge pull request #22 from ebayraktar/master
Browse files Browse the repository at this point in the history
Converted FadingTextView file from Java to Kotlin
  • Loading branch information
rosenpin authored Jun 2, 2023
2 parents 0b45bff + abf7487 commit 0e39e1e
Show file tree
Hide file tree
Showing 11 changed files with 303 additions and 469 deletions.
36 changes: 0 additions & 36 deletions app/build.gradle

This file was deleted.

42 changes: 42 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import org.gradle.api.JavaVersion

plugins {
id("com.android.application")
}

android {
compileSdk = 33

defaultConfig {
applicationId = "com.tomerrosenfeld.fadingtextview"
minSdk = 23
targetSdk = 33
vectorDrawables.useSupportLibrary = true
versionCode = 2
versionName = "1.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
getByName("release") {
isMinifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
}
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
}

dependencies {
androidTestImplementation("androidx.test.espresso:espresso-core:3.1.0") {
exclude(group = "com.android.support", module = "support-annotations")
}
implementation(project(":fadingtextview"))
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.9.0")
implementation("org.adw.library:discrete-seekbar:1.0.1")
testImplementation("junit:junit:4.13.2")
}
27 changes: 0 additions & 27 deletions build.gradle

This file was deleted.

23 changes: 23 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
buildscript {
val kotlin_version = "1.6.21"
repositories {
jcenter()
google()
}
dependencies {
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")
}
}

allprojects {
repositories {
jcenter()
maven {
url = uri("https://maven.google.com")
}
google()
}
}
52 changes: 0 additions & 52 deletions fadingtextview/build.gradle

This file was deleted.

49 changes: 49 additions & 0 deletions fadingtextview/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
plugins {
id("com.android.library")
id("org.jetbrains.kotlin.android")
}

val bintrayRepo = "maven"
val bintrayName = "fadingtextview"

val publishedGroupId = "com.tomer"
val libraryName = "fadingtextview"
val artifact = "fadingtextview"

val libraryDescription = "A textview that changes its content automatically every few seconds Edit"

val siteUrl = "https://github.com/rosenpin/FadingTextView"
val gitUrl = "https://github.com/rosenpin/FadingTextView.git"

val libraryVersion = "2.6"

val developerId = "rosenpin"
val developerName = "Tomer Rosenfeld"
val developerEmail = "[email protected]"

val licenseName = "The Apache Software License, Version 2.0"
val licenseUrl = "http://www.apache.org/licenses/LICENSE-2.0.txt"
val allLicenses = listOf("Apache-2.0")

android {
namespace = "com.tomer.fadingtextview"
compileSdk = 32

defaultConfig {
minSdk = 14
targetSdk = 32
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
getByName("release") {
isMinifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
}
}
}

dependencies {
implementation("androidx.appcompat:appcompat:1.4.2")
testImplementation("junit:junit:4.12")
}
Loading

0 comments on commit 0e39e1e

Please sign in to comment.