Skip to content

Commit

Permalink
Reverted gradle files from kotlin
Browse files Browse the repository at this point in the history
  • Loading branch information
Kwasow committed Mar 31, 2021
1 parent 37ced02 commit 1691155
Show file tree
Hide file tree
Showing 5 changed files with 102 additions and 131 deletions.
51 changes: 51 additions & 0 deletions BottomNavigationCircles/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
plugins {
id 'com.android.library'
id 'kotlin-android'
}

static def getDate() {
return new Date().format('yyMMddHHmm', TimeZone.getTimeZone("GMT+0"));
}

android {
compileSdkVersion 30
buildToolsVersion "30.0.3"

defaultConfig {
minSdkVersion 21
targetSdkVersion 30
versionCode getDate() as Integer
versionName "1.1-beta5"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}

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

kotlinOptions {
jvmTarget = '1.8'
}
}

dependencies {

implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation 'androidx.core:core-ktx:1.3.2'
implementation 'androidx.appcompat:appcompat:1.2.0'
api "com.google.android.material:material:1.4.0-alpha02"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1"
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
}
72 changes: 0 additions & 72 deletions BottomNavigationCircles/build.gradle.kts

This file was deleted.

45 changes: 45 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
plugins {
id 'com.android.application'
id 'kotlin-android'
}

android {
compileSdkVersion 30
buildToolsVersion "30.0.3"

defaultConfig {
applicationId "com.github.kwasow.bottomnavigationcirclesexample"
minSdkVersion 21
targetSdkVersion 30
versionCode 1
versionName "1.0"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = '1.8'
}
}

dependencies {

implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation 'androidx.core:core-ktx:1.3.2'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation project(":BottomNavigationCircles")
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
}
51 changes: 0 additions & 51 deletions app/build.gradle.kts

This file was deleted.

14 changes: 6 additions & 8 deletions build.gradle.kts → build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
val kotlinVersion by extra("1.4.32")
ext.kotlin_version = "1.4.32"
repositories {
google()
jcenter()
}
dependencies {
classpath("com.android.tools.build:gradle:4.1.3")
classpath(kotlin("gradle-plugin", kotlinVersion))
classpath "com.android.tools.build:gradle:4.1.3"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -21,8 +21,6 @@ allprojects {
}
}

tasks {
val clean by registering(Delete::class) {
delete(buildDir)
}
}
task clean(type: Delete) {
delete rootProject.buildDir
}

0 comments on commit 1691155

Please sign in to comment.