From f1a78a1f470f9e1c107b0796689f5050fa070703 Mon Sep 17 00:00:00 2001 From: Arty Bishop Date: Thu, 25 Feb 2021 20:38:06 +0000 Subject: [PATCH] Dependencies update --- app/build.gradle | 27 ++++----------------------- build.gradle | 39 +++++++++++---------------------------- 2 files changed, 15 insertions(+), 51 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0a55ad6c..15a1ba7d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,22 +1,3 @@ -/******************************************************************************* - Look4Sat. Amateur radio satellite tracker and pass predictor. - Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - ******************************************************************************/ - plugins { id "com.android.application" id "kotlin-android" @@ -26,7 +7,7 @@ plugins { android { compileSdkVersion 30 - buildToolsVersion "30.0.2" + buildToolsVersion "30.0.3" defaultConfig { applicationId "com.rtbishop.look4sat" @@ -67,6 +48,7 @@ android { dependencies { implementation "com.google.android.material:material:$material_version" implementation "androidx.constraintlayout:constraintlayout:$constraint_layout_version" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version" implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version" implementation "androidx.navigation:navigation-ui-ktx:$navigation_version" implementation "androidx.preference:preference-ktx:$preference_version" @@ -77,7 +59,6 @@ dependencies { implementation "com.google.dagger:hilt-android:$hilt_version" kapt "com.google.dagger:hilt-android-compiler:$hilt_version" - implementation "androidx.hilt:hilt-lifecycle-viewmodel:$hilt_viewmodel_version" kapt "androidx.hilt:hilt-compiler:$hilt_viewmodel_version" @@ -86,8 +67,8 @@ dependencies { implementation "org.osmdroid:osmdroid-android:$osmdroid_version" implementation "com.github.davidmoten:predict4java:$predict4java_version" - - debugImplementation "com.squareup.leakcanary:leakcanary-android:$leak_canary_version" + implementation "com.jakewharton.timber:timber:$timber_version" testImplementation "junit:junit:$junit_version" + debugImplementation "com.squareup.leakcanary:leakcanary-android:$leak_canary_version" } diff --git a/build.gradle b/build.gradle index 64d9b62a..510e74af 100644 --- a/build.gradle +++ b/build.gradle @@ -1,39 +1,22 @@ -/******************************************************************************* - Look4Sat. Amateur radio satellite tracker and pass predictor. - Copyright (C) 2019, 2020 Arty Bishop (bishop.arty@gmail.com) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - ******************************************************************************/ - buildscript { ext { - gradle_version = '4.1.1' - gradle_plugin_version = '1.4.20' - material_version = '1.2.1' + gradle_version = '4.1.2' + gradle_plugin_version = '1.4.30' + material_version = '1.3.0' constraint_layout_version = '2.0.4' - navigation_version = '2.3.1' + lifecycle_version = '2.3.0' + navigation_version = '2.3.3' preference_version = '1.1.1' view_pager2_version = '1.0.0' - room_version = '2.2.5' - hilt_version = '2.30.1-alpha' - hilt_viewmodel_version = '1.0.0-alpha02' + room_version = '2.2.6' + hilt_version = '2.32-alpha' + hilt_viewmodel_version = '1.0.0-alpha03' retrofit_version = '2.9.0' - osmdroid_version = '6.1.8' + osmdroid_version = '6.1.10' + timber_version = '4.7.1' predict4java_version = '1.3.1' + junit_version = '4.13.2' leak_canary_version = '2.5' - junit_version = '4.13.1' } repositories { google()