Skip to content
This repository has been archived by the owner on Jan 29, 2023. It is now read-only.

Update kotlin to 1.3.70 #299

Merged
merged 2 commits into from
Mar 21, 2020
Merged

Update kotlin to 1.3.70 #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0f1f17
Move the rest of deps to buildSrc
vase4kin Mar 21, 2020
5209bba
Update kotlin to 1.3.70
vase4kin Mar 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 29 additions & 29 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2019 Andrey Tolpeev
* Copyright 2020 Andrey Tolpeev
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -75,7 +75,7 @@ android {
}

android.variantFilter { variant ->
if(variant.buildType.name.equals('release')
if (variant.buildType.name.equals('release')
&& variant.getFlavors().get(0).name.equals('mock')) {
variant.setIgnore(true)
}
Expand Down Expand Up @@ -137,9 +137,9 @@ dependencies {

// Android support libraries
implementation Libs.AndroidX.appcompat
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.legacy:legacy-support-v13:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
implementation Libs.AndroidX.cardView
implementation Libs.AndroidX.legacySupport
implementation Libs.AndroidX.recyclerView
implementation Libs.Google.material
implementation Libs.AndroidX.constraintLayout
// Api third party libraries
Expand All @@ -158,14 +158,14 @@ dependencies {
annotationProcessor Libs.ButterKnife.butterKnifeCompiler
kapt Libs.ButterKnife.butterKnifeCompiler
// Event bus
implementation 'org.greenrobot:eventbus:3.0.0'
implementation Libs.eventBus
// Others
implementation 'joda-time:joda-time:2.8.1'
implementation 'com.vinaysshenoy:mugen:1.0.2'
implementation 'io.supercharge:shimmerlayout:2.1.0'
implementation Libs.jodaTime
implementation Libs.mugen
implementation Libs.shimmerlayout
implementation Libs.aboutLibrary
// Onboarding
implementation 'uk.co.samuelwall:material-tap-target-prompt:2.14.0'
implementation Libs.materialTapTargetPrompt
// Dagger
implementation Libs.Dagger.dagger
annotationProcessor Libs.Dagger.compiler
Expand All @@ -178,53 +178,53 @@ dependencies {
implementation Libs.RxJava.rxAndroid
implementation Libs.RxJava.rxjava_kotlin
// Rx cache
implementation "com.github.VictorAlbertos.RxCache:runtime:1.8.3-2.x"
implementation 'com.github.VictorAlbertos.Jolyglot:gson:0.0.4'
implementation Libs.RxCache.rxCache
implementation Libs.RxCache.jolyglot
// Encryption
implementation 'com.facebook.conceal:conceal:1.1.3@aar'
implementation Libs.conceal
// Firebase
implementation Libs.Google.firebaseCore
implementation Libs.Google.firebaseConfig
implementation Libs.Google.firebasePerf
// Bottom nav libries
implementation 'com.ncapdevi:frag-nav:3.3.0'
implementation 'com.aurelhubert:ahbottomnavigation:2.3.4'
implementation Libs.fragNav
implementation Libs.ahbottomnavigation
// Unit tests
testImplementation Libs.junit
testImplementation Libs.Mockito.mockito
testImplementation 'org.hamcrest:hamcrest-junit:2.0.0.0'
testImplementation Libs.hamcrestJunit
testImplementation Libs.PowerMock.junit4
testImplementation Libs.PowerMock.junitRule
testImplementation Libs.PowerMock.apiMockito
testImplementation Libs.PowerMock.classLoadingXstream
// Ui tests
// Core library
androidTestImplementation 'androidx.test:core:1.2.0'
androidTestImplementation Libs.AndroidX.Test.core
// AndroidJUnitRunner and JUnit Rules
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test:rules:1.2.0'
androidTestImplementation Libs.AndroidX.Test.runner
androidTestImplementation Libs.AndroidX.Test.rules
// Assertions
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation Libs.AndroidX.Test.extJunit
// Espresso dependenciesd
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-web:3.2.0'
androidTestImplementation Libs.AndroidX.Test.Espresso.core
androidTestImplementation Libs.AndroidX.Test.Espresso.intents
androidTestImplementation Libs.AndroidX.Test.Espresso.contrib
androidTestImplementation Libs.AndroidX.Test.Espresso.web
// Mockito
androidTestImplementation Libs.Mockito.mockito
// Dex maker
androidTestImplementation Libs.DexMaker.dexmaker
androidTestImplementation Libs.DexMaker.dexmakerDx
androidTestImplementation Libs.DexMaker.dexmakerMockito
// Dagger mock
androidTestImplementation 'com.github.fabioCollini:DaggerMock:0.8.5'
androidTestImplementation Libs.daggerMock
// Condition watcher
androidTestImplementation 'com.azimolabs.conditionwatcher:conditionwatcher:0.2'
androidTestImplementation Libs.conditionwatcher
// Resolve conflits between apks
androidTestImplementation 'com.google.android.material:material:1.0.0'
androidTestImplementation 'androidx.recyclerview:recyclerview:1.0.0'
androidTestImplementation Libs.Google.material
androidTestImplementation Libs.AndroidX.recyclerView
// Crashlytics
implementation('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
implementation(Libs.crashlytics) {
transitive = true
}

Expand Down
41 changes: 40 additions & 1 deletion buildSrc/src/main/kotlin/teamcityapp/buildsrc/Dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,27 @@ object Libs {
const val errorView = "tr.xip.errorview:library:3.0.0"
const val aboutLibrary = "com.github.daniel-stoneuk:material-about-library:2.4.2"
const val dialogs = "com.afollestad.material-dialogs:core:0.9.6.0"
const val shimmerlayout = "io.supercharge:shimmerlayout:2.1.0"
const val eventBus = "org.greenrobot:eventbus:3.0.0"
const val materialTapTargetPrompt = "uk.co.samuelwall:material-tap-target-prompt:2.14.0"
const val conceal = "com.facebook.conceal:conceal:1.1.3@aar"
const val jodaTime = "joda-time:joda-time:2.8.1"
const val mugen = "com.vinaysshenoy:mugen:1.0.2"
const val fragNav = "com.ncapdevi:frag-nav:3.3.0"
const val ahbottomnavigation = "com.aurelhubert:ahbottomnavigation:2.3.4"

const val junit = "junit:junit:4.12"
const val hamcrestJunit = "org.hamcrest:hamcrest-junit:2.0.0.0"
const val daggerMock = "com.github.fabioCollini:DaggerMock:0.8.5"
const val conditionwatcher = "com.azimolabs.conditionwatcher:conditionwatcher:0.2"

const val crashlytics = "com.crashlytics.sdk.android:crashlytics:2.6.8@aar"

object AndroidX {
const val appcompat = "androidx.appcompat:appcompat:1.0.2"
const val cardView = "androidx.cardview:cardview:1.0.0"
const val legacySupport = "androidx.legacy:legacy-support-v13:1.0.0"
const val recyclerView = "androidx.recyclerview:recyclerview:1.0.0"
const val annotationn = "androidx.annotation:annotation:1.0.2"
const val browser = "androidx.browser:browser:1.0.0"
const val constraintLayout = "com.android.support.constraint:constraint-layout:1.1.3"
Expand All @@ -48,6 +64,24 @@ object Libs {
const val lifeCycle = "androidx.lifecycle:lifecycle-runtime:$version"
const val lifeCycleCompiler = "androidx.lifecycle:lifecycle-compiler:$version"
}

object Test {

private const val version = "1.2.0"
const val core = "androidx.test:core:$version"
const val runner = "androidx.test:runner:$version"
const val rules = "androidx.test:rules:$version"

const val extJunit = "androidx.test.ext:junit:1.1.1"

object Espresso {
private const val version = "3.2.0"
const val core = "androidx.test.espresso:espresso-core:$version"
const val intents = "androidx.test.espresso:espresso-intents:$version"
const val contrib = "androidx.test.espresso:espresso-contrib:$version"
const val web = "androidx.test.espresso:espresso-web:$version"
}
}
}

object Google {
Expand Down Expand Up @@ -86,6 +120,11 @@ object Libs {
const val rxjava_kotlin = "io.reactivex.rxjava2:rxkotlin:2.4.0"
}

object RxCache {
const val rxCache = "com.github.VictorAlbertos.RxCache:runtime:1.8.3-2.x"
const val jolyglot = "com.github.VictorAlbertos.Jolyglot:gson:0.0.4"
}

object Dagger {
private const val version = "2.25.2"
const val dagger = "com.google.dagger:dagger:$version"
Expand All @@ -108,7 +147,7 @@ object Libs {
}

object Kotlin {
private const val version = "1.3.50"
private const val version = "1.3.70"
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$version"

object Tools {
Expand Down