Skip to content

Commit

Permalink
use kotlin extensions and common Gradle in dependency managemnt
Browse files Browse the repository at this point in the history
  • Loading branch information
ShabanKamell committed Dec 17, 2019
1 parent 9f27501 commit 4cdba90
Show file tree
Hide file tree
Showing 39 changed files with 45 additions and 125 deletions.
Binary file modified buildSrc/build/classes/kotlin/main/Deps.class
Binary file not shown.
Binary file modified buildSrc/build/classes/kotlin/main/Plugins.class
Binary file not shown.
Binary file modified buildSrc/build/classes/kotlin/main/TestDeps.class
Binary file not shown.
Binary file modified buildSrc/build/classes/kotlin/main/Versions.class
Binary file not shown.
Binary file modified buildSrc/build/kotlin/compileKotlin/build-history.bin
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
8
3
16
11
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified buildSrc/build/kotlin/compileKotlin/last-build.bin
Binary file not shown.
Binary file modified buildSrc/build/libs/buildSrc.jar
Binary file not shown.
21 changes: 13 additions & 8 deletions buildSrc/src/main/kotlin/Deps.kt
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,28 @@ object Versions {
const val androidx_test_rules = "1.3.0-alpha02"
const val mockito_kotlin = "2.2.0"
const val modelMapper = "0.1.0"
const val androidx_appCompat = "1.1.0"
const val android_material = "1.2.0-alpha02"
const val rxJava = "2.2.15"
const val androidx_core_ktx = "1.1.0"
const val multidex = "2.0.1"
}

object Deps {
const val test_junit = "junit:junit:${Versions.test_junit}"
const val androidx_espressoCore = "androidx.test.espresso:espresso-core:${Versions.androidx_espressoCore}"
const val androidx_appCompat = "androidx.appcompat:appcompat:${Versions.androidx_appCompat}"
const val android_material = "com.google.android.material:material:${Versions.android_material}"
const val rxJava = "io.reactivex.rxjava2:rxjava:${Versions.rxJava}"
const val androidx_core_ktx = "androidx.core:core-ktx:${Versions.androidx_core_ktx}"
const val multidex = "androidx.multidex:multidex:${Versions.multidex}"
}

object TestDeps {

const val test_junit = "junit:junit:${Versions.test_junit}"
const val androidx_espressoCore = "androidx.test.espresso:espresso-core:${Versions.androidx_espressoCore}"
const val junit = "junit:junit:${Versions.test_junit}"
const val androidx_junit = "androidx.test.ext:junit:${Versions.androidx_junit}"

// <editor-fold desc="mockito">
const val mockito_core = "org.mockito:mockito-core:${Versions.mockito_core}"
const val androidx_test_core_ktx = "androidx.test:core-ktx:${Versions.androidx_test_core_ktx}"
const val mockito_kotlin = "com.nhaarman.mockitokotlin2:mockito-kotlin:${Versions.mockito_kotlin}"
// </editor-fold>

const val hamcrest_all = "org.hamcrest:hamcrest-all:${Versions.hamcrest_all}"
const val kotlinx_coroutine_test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:${Versions.kotlinx_coroutine_test}"
Expand All @@ -42,7 +48,6 @@ object TestDeps {
const val truth = "com.google.truth:truth:${Versions.truth}"

// <editor-fold desc="androidx">
const val androidx_test_core_ktx = "androidx.test:core-ktx:${Versions.androidx_test_core_ktx}"
const val androidx_test_ext_junit_ktx = "androidx.test.ext:junit-ktx:${Versions.androidx_test_ext_junit_ktx}"
const val androidx_test_rules = "androidx.test:rules:${Versions.androidx_test_rules}"
const val androidx_core_testing = "androidx.arch.core:core-testing:${Versions.androidx_core_testing}"
Expand Down
1 change: 1 addition & 0 deletions buildSrc/src/main/kotlin/Plugins.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ object Plugins {
const val androidApplication = "com.android.application"
const val androidLibrary = "com.android.library"
const val kotlinAndroid = "kotlin-android"
const val dcendents = "com.github.dcendents.android-maven"
const val kotlinAndroidExtensions = "kotlin-android-extensions"
const val kotlinKapt = "kotlin-kapt"
}
12 changes: 6 additions & 6 deletions common.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,15 @@ android {

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro'
multiDexEnabled true

}

android {
lintOptions { abortOnError false }
testOptions { unitTests.includeAndroidResources = true }
}

compileOptions {
targetCompatibility Config.javaVersion
sourceCompatibility Config.javaVersion
Expand All @@ -40,11 +46,5 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])

implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

testImplementation Deps.test_junit
testImplementation Deps.androidx_junit
testImplementation Deps.androidx_espressoCore

}
65 changes: 14 additions & 51 deletions lib/build.gradle
Original file line number Diff line number Diff line change
@@ -1,54 +1,17 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-android'
apply plugin: 'com.github.dcendents.android-maven'

android {
compileSdkVersion 29

defaultConfig {
minSdkVersion 14
targetSdkVersion 29
versionCode 1
versionName "0.5.0"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
android {
lintOptions {
abortOnError false
}

testOptions {
unitTests.includeAndroidResources = true
}
}

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

apply plugin: Plugins.androidLibrary
apply from: "$rootDir/${GradleName.common}"
apply plugin: "${Plugins.kotlinAndroid}"
apply plugin: "${Plugins.kotlinAndroidExtensions}"
apply plugin: "${Plugins.dcendents}"

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.google.android.material:material:1.2.0-alpha02'
api "io.reactivex.rxjava2:rxjava:2.2.15"
implementation "androidx.core:core-ktx:+"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

implementation TestDeps.test_junit
implementation TestDeps.mockito_kotlin
implementation TestDeps.androidx_junit
implementation TestDeps.androidx_test_core_ktx

}
repositories {
mavenCentral()
api Deps.rxJava
implementation Deps.androidx_appCompat
implementation Deps.android_material
implementation Deps.androidx_core_ktx

testImplementation TestDeps.junit
testImplementation TestDeps.androidx_junit
testImplementation TestDeps.androidx_espressoCore
testImplementation TestDeps.androidx_test_core_ktx
}
67 changes: 9 additions & 58 deletions sample/build.gradle
Original file line number Diff line number Diff line change
@@ -1,62 +1,13 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-android'

android {
compileSdkVersion 29

defaultConfig {
applicationId "com.sha.formvalidatorsample"
minSdkVersion 15
targetSdkVersion 29
versionCode 1
versionName "1.0"

renderscriptTargetApi 25
renderscriptSupportModeEnabled true
multiDexEnabled true
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
android {
lintOptions {
abortOnError false
}
}

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

ext {
supportVersion = '25.1.1'
frescoVersion = '1.2.0'
}
apply plugin: Plugins.androidApplication
apply from: "$rootDir/${GradleName.common}"
apply plugin: "${Plugins.kotlinAndroid}"
apply plugin: "${Plugins.kotlinAndroidExtensions}"

dependencies {
implementation project(':lib')
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.cardview:cardview:1.0.0'

implementation 'com.github.mmin18:realtimeblurview:1.1.0'
implementation 'me.relex:circleindicator:1.2.2@aar'

implementation 'com.squareup.picasso:picasso:2.71828'
implementation 'jp.co.cyberagent.android.gpuimage:gpuimage-library:1.3.0'

implementation 'com.annimon:stream:1.2.1'
implementation 'androidx.multidex:multidex:2.0.1'
compile "androidx.core:core-ktx:+"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
repositories {
mavenCentral()
}
implementation Deps.androidx_appCompat
implementation Deps.android_material
implementation Deps.androidx_core_ktx
implementation Deps.multidex
}

0 comments on commit 4cdba90

Please sign in to comment.