Skip to content
This repository has been archived by the owner on Nov 13, 2021. It is now read-only.

Commit

Permalink
Updated gradle and several libs
Browse files Browse the repository at this point in the history
  • Loading branch information
leinardi committed May 26, 2019
1 parent 064b6fb commit 7b76f59
Show file tree
Hide file tree
Showing 27 changed files with 110 additions and 297 deletions.
7 changes: 3 additions & 4 deletions .idea/checkstyle-idea.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 1 addition & 26 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ buildscript {
addRepos(repositories)
}
dependencies {
classpath deps.android_gradle_plugin
classpath deps.android_checkstyle_plugin
classpath deps.android_maven_gradle_plugin
classpath deps.gradle_bintray_plugin
classpath deps.gradle_versions_plugin
classpath "com.android.tools.build:gradle:$versions.android_gradle_plugin"
classpath "com.leinardi.android:android-checkstyle-plugin:$versions.android_checkstyle_plugin"
classpath "com.github.dcendents:android-maven-gradle-plugin:$versions.android_maven_gradle_plugin"
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$versions.gradle_bintray_plugin"
classpath "com.github.ben-manes:gradle-versions-plugin:$versions.gradle_versions_plugin"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand Down
2 changes: 1 addition & 1 deletion checkstyle.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ checkstyle {
ignoreFailures = false // Whether this task will ignore failures and continue running the build.
configFile rootProject.file('config/checkstyle/checkstyle.xml')
// The Checkstyle configuration file to use.
toolVersion = '8.7' // The version of Checkstyle you want to be used
toolVersion = '8.20' // The version of Checkstyle you want to be used
}
2 changes: 1 addition & 1 deletion config/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<module name="Checker">

<module name="SuppressionFilter">
<property name="file" value="config/checkstyle/checkstyle-suppressions.xml" />
<property name="file" value="${config_loc}/suppressions.xml" />
</module>

<!-- Checks that a package-info.java file exists for each package. -->
Expand Down
147 changes: 4 additions & 143 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,158 +20,19 @@
**/
ext.deps = [:]
def versions = [:]
versions.android_checkstyle_plugin = "1.0.0"
versions.android_gradle_plugin = "3.1.2"
versions.android_checkstyle_plugin = "1.1.0"
versions.android_gradle_plugin = "3.4.1"
versions.android_maven_gradle_plugin = "2.1"
versions.androidthings = "1.0"
versions.apache_commons = "2.5"
versions.arch = hasProperty("ARCH_VERSION") ? getProperty("ARCH_VERSION") : "1.1.0"
versions.atsl_rules = "1.0.1"
versions.atsl_runner = "1.0.1"
versions.constraint_layout = "1.0.2"
versions.dagger = "2.14.1"
versions.dexmaker = "2.2.0"
versions.espresso = "3.0.1"
versions.glide = "3.8.0"
versions.gradle_bintray_plugin = "1.8.0"
versions.gradle_versions_plugin = "0.17.0"
versions.hamcrest = "1.3"
versions.joystick = "1.1.0"
versions.junit = "4.12"
versions.kotlin = "1.2"
versions.mockito = "2.13.3"
versions.mockito_all = "1.10.19"
versions.mockwebserver = "3.9.1"
versions.paging = "1.0.0-alpha3"
versions.play_services = "12.5.20"
versions.powermock = "1.7.4"
versions.retrofit = "2.3.0"
versions.rx_android = "2.0.1"
versions.rxjava2 = "2.1.9"
versions.gradle_versions_plugin = "0.21.0"
versions.powermock = "2.0.2"
versions.support = "27.1.1"
versions.timber = "4.6.0"
ext.versions = versions

def deps = [:]

def support = [:]
support.annotations = "com.android.support:support-annotations:$versions.support"
support.app_compat = "com.android.support:appcompat-v7:$versions.support"
support.cardview = "com.android.support:cardview-v7:$versions.support"
support.core_utils = "com.android.support:support-core-utils:$versions.support"
support.design = "com.android.support:design:$versions.support"
support.fragment = "com.android.support:support-fragment:$versions.support"
support.recyclerview = "com.android.support:recyclerview-v7:$versions.support"
support.v4 = "com.android.support:support-v4:$versions.support"
deps.support = support

def room = [:]
room.compiler = "android.arch.persistence.room:compiler:$versions.arch"
room.runtime = "android.arch.persistence.room:runtime:$versions.arch"
room.rxjava2 = "android.arch.persistence.room:rxjava2:$versions.arch"
room.testing = "android.arch.persistence.room:testing:$versions.arch"
deps.room = room

def lifecycle = [:]
lifecycle.compiler = "android.arch.lifecycle:compiler:$versions.arch"
lifecycle.extensions = "android.arch.lifecycle:extensions:$versions.arch"
lifecycle.java8 = "android.arch.lifecycle:common-java8:$versions.arch"
lifecycle.runtime = "android.arch.lifecycle:runtime:$versions.arch"
deps.lifecycle = lifecycle

def arch_core = [:]
arch_core.testing = "android.arch.core:core-testing:$versions.arch"
deps.arch_core = arch_core

def play_services = [:]
play_services.googl_plus = "com.google.android.gms:play-services-plus:$versions.play_services"
play_services.account_login = "com.google.android.gms:play-services-auth:$versions.play_services"
play_services.actions_base_client_library = "com.google.android.gms:play-services-base:$versions.play_services"
play_services.sign_in = "com.google.android.gms:play-services-identity:$versions.play_services"
play_services.analytics = "com.google.android.gms:play-services-analytics:$versions.play_services"
play_services.awareness = "com.google.android.gms:play-services-awareness:$versions.play_services"
play_services.cast = "com.google.android.gms:play-services-cast:$versions.play_services"
play_services.cloud_messaging = "com.google.android.gms:play-services-gcm:$versions.play_services"
play_services.drive = "com.google.android.gms:play-services-drive:$versions.play_services"
play_services.fit = "com.google.android.gms:play-services-fitness:$versions.play_services"
play_services.location_and_activity_recognition = "com.google.android.gms:play-services-location:$versions.play_services"
play_services.maps = "com.google.android.gms:play-services-maps:$versions.play_services"
play_services.mobile_ads = "com.google.android.gms:play-services-ads:$versions.play_services"
play_services.places = "com.google.android.gms:play-services-places:$versions.play_services"
play_services.mobile_vision = "com.google.android.gms:play-services-vision:$versions.play_services"
play_services.nearby = "com.google.android.gms:play-services-nearby:$versions.play_services"
play_services.panorama_viewer = "com.google.android.gms:play-services-panorama:$versions.play_services"
play_services.play_game_services = "com.google.android.gms:play-services-games:$versions.play_services"
play_services.safety_net = "com.google.android.gms:play-services-safetynet:$versions.play_services"
play_services.android_pay = "com.google.android.gms:play-services-wallet:$versions.play_services"
play_services.android_wear = "com.google.android.gms:play-services-wearable:$versions.play_services"
deps.play_services = play_services

def retrofit = [:]
retrofit.gson = "com.squareup.retrofit2:converter-gson:$versions.retrofit"
retrofit.runtime = "com.squareup.retrofit2:retrofit:$versions.retrofit"
deps.retrofit = retrofit


def dagger = [:]
dagger.android = "com.google.dagger:dagger-android:$versions.dagger"
dagger.android_support = "com.google.dagger:dagger-android-support:$versions.dagger"
dagger.android_support_compiler = "com.google.dagger:dagger-android-processor:$versions.dagger"
dagger.compiler = "com.google.dagger:dagger-compiler:$versions.dagger"
dagger.runtime = "com.google.dagger:dagger:$versions.dagger"

deps.dagger = dagger

def espresso = [:]
espresso.core = "com.android.support.test.espresso:espresso-core:$versions.espresso"
espresso.contrib = "com.android.support.test.espresso:espresso-contrib:$versions.espresso"
espresso.intents = "com.android.support.test.espresso:espresso-intents:$versions.espresso"
deps.espresso = espresso

def atsl = [:]
atsl.runner = "com.android.support.test:runner:$versions.atsl_runner"
atsl.rules = "com.android.support.test:rules:$versions.atsl_runner"
deps.atsl = atsl

def mockito = [:]
mockito.core = "org.mockito:mockito-core:$versions.mockito"
mockito.all = "org.mockito:mockito-all:$versions.mockito_all"
deps.mockito = mockito

def powermock = [:]
powermock.module_junit4 = "org.powermock:powermock-module-junit4:$versions.powermock"
powermock.api_mockito = "org.powermock:powermock-api-mockito2:$versions.powermock"
deps.powermock = powermock

def kotlin = [:]
kotlin.stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jre7:$versions.kotlin"
kotlin.test = "org.jetbrains.kotlin:kotlin-test-junit:$versions.kotlin"
kotlin.plugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
deps.kotlin = kotlin

deps.android_checkstyle_plugin = "com.leinardi.android:android-checkstyle-plugin:$versions.android_checkstyle_plugin"
deps.android_gradle_plugin = "com.android.tools.build:gradle:$versions.android_gradle_plugin"
deps.android_maven_gradle_plugin = "com.github.dcendents:android-maven-gradle-plugin:$versions.android_maven_gradle_plugin"
deps.androidthings = "com.google.android.things:androidthings:$versions.androidthings"
deps.constraint_layout = "com.android.support.constraint:constraint-layout:$versions.constraint_layout"
deps.dexmaker = "com.linkedin.dexmaker:dexmaker-mockito:$versions.dexmaker"
deps.glide = "com.github.bumptech.glide:glide:$versions.glide"
deps.gradle_bintray_plugin = "com.jfrog.bintray.gradle:gradle-bintray-plugin:$versions.gradle_bintray_plugin"
deps.gradle_versions_plugin = "com.github.ben-manes:gradle-versions-plugin:$versions.gradle_versions_plugin"
deps.hamcrest = "org.hamcrest:hamcrest-all:$versions.hamcrest"
deps.joystick = "com.github.erz05:JoyStick:$versions.joystick"
deps.junit = "junit:junit:$versions.junit"
deps.mock_web_server = "com.squareup.okhttp3:mockwebserver:$versions.mockwebserver"
deps.paging = "android.arch.paging:runtime:$versions.paging"
deps.rx_android = "io.reactivex.rxjava2:rxandroid:$versions.rx_android"
deps.rxjava2 = "io.reactivex.rxjava2:rxjava:$versions.rxjava2"
deps.timber = "com.jakewharton.timber:timber:$versions.timber"
ext.deps = deps

def build_versions = [:]
build_versions.min_sdk = 26
build_versions.target_sdk = 27
build_versions.build_tools = "27.0.3"
build_versions.java_version = JavaVersion.VERSION_1_7
build_versions.version_code = 'git rev-list --count HEAD'.execute().text.trim() as int
ext.build_versions = build_versions
Expand Down
7 changes: 3 additions & 4 deletions driver-ds3231-receiver/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ apply from: rootProject.file('checkstyle.gradle')

android {
compileSdkVersion build_versions.target_sdk
buildToolsVersion build_versions.build_tools

apply from: 'mavenConfig.gradle'

Expand All @@ -46,7 +45,7 @@ android {
}

dependencies {
compileOnly deps.androidthings
implementation deps.support.annotations
implementation 'com.leinardi.android.things:driver-ds3231:0.2'
compileOnly "com.google.android.things:androidthings:$versions.androidthings"
implementation "com.android.support:support-annotations:$versions.support"
implementation 'com.leinardi.android.things:driver-ds3231:1.0'
}
11 changes: 5 additions & 6 deletions driver-ds3231/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ apply from: rootProject.file('checkstyle.gradle')

android {
compileSdkVersion build_versions.target_sdk
buildToolsVersion build_versions.build_tools

apply from: 'mavenConfig.gradle'

Expand All @@ -47,10 +46,10 @@ android {
}

dependencies {
compileOnly deps.androidthings
implementation deps.support.annotations
compileOnly "com.google.android.things:androidthings:$versions.androidthings"
implementation "com.android.support:support-annotations:$versions.support"

testImplementation deps.androidthings
testImplementation deps.powermock.module_junit4
testImplementation deps.powermock.api_mockito
testImplementation "com.google.android.things:androidthings:$versions.androidthings"
testImplementation "org.powermock:powermock-module-junit4:$versions.powermock"
testImplementation "org.powermock:powermock-api-mockito2:$versions.powermock"
}
5 changes: 2 additions & 3 deletions driver-epaperdriverhat/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ apply from: rootProject.file('checkstyle.gradle')

android {
compileSdkVersion build_versions.target_sdk
buildToolsVersion build_versions.build_tools

apply from: 'mavenConfig.gradle'

Expand All @@ -46,6 +45,6 @@ android {
}

dependencies {
compileOnly deps.androidthings
implementation deps.support.annotations
compileOnly "com.google.android.things:androidthings:$versions.androidthings"
implementation "com.android.support:support-annotations:$versions.support"
}
5 changes: 2 additions & 3 deletions driver-hcsr04/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ apply from: rootProject.file('checkstyle.gradle')

android {
compileSdkVersion build_versions.target_sdk
buildToolsVersion build_versions.build_tools

apply from: 'mavenConfig.gradle'

Expand All @@ -46,6 +45,6 @@ android {
}

dependencies {
compileOnly deps.androidthings
implementation deps.support.annotations
compileOnly "com.google.android.things:androidthings:$versions.androidthings"
implementation "com.android.support:support-annotations:$versions.support"
}
11 changes: 5 additions & 6 deletions driver-hd44780/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ apply from: rootProject.file('checkstyle.gradle')

android {
compileSdkVersion build_versions.target_sdk
buildToolsVersion build_versions.build_tools

apply from: 'mavenConfig.gradle'

Expand All @@ -46,10 +45,10 @@ android {
}

dependencies {
compileOnly deps.androidthings
implementation deps.support.annotations
compileOnly "com.google.android.things:androidthings:$versions.androidthings"
implementation "com.android.support:support-annotations:$versions.support"

testImplementation deps.androidthings
testImplementation deps.powermock.module_junit4
testImplementation deps.powermock.api_mockito
testImplementation "com.google.android.things:androidthings:$versions.androidthings"
testImplementation "org.powermock:powermock-module-junit4:$versions.powermock"
testImplementation "org.powermock:powermock-api-mockito2:$versions.powermock"
}
11 changes: 5 additions & 6 deletions driver-lsm9ds1/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ apply from: rootProject.file('checkstyle.gradle')

android {
compileSdkVersion build_versions.target_sdk
buildToolsVersion build_versions.build_tools

apply from: 'mavenConfig.gradle'

Expand All @@ -46,10 +45,10 @@ android {
}

dependencies {
compileOnly deps.androidthings
implementation deps.support.annotations
compileOnly "com.google.android.things:androidthings:$versions.androidthings"
implementation "com.android.support:support-annotations:$versions.support"

testImplementation deps.androidthings
testImplementation deps.powermock.module_junit4
testImplementation deps.powermock.api_mockito
testImplementation "com.google.android.things:androidthings:$versions.androidthings"
testImplementation "org.powermock:powermock-module-junit4:$versions.powermock"
testImplementation "org.powermock:powermock-api-mockito2:$versions.powermock"
}
Loading

0 comments on commit 7b76f59

Please sign in to comment.