diff --git a/app/build.gradle b/app/build.gradle index d899278d..b6962572 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -67,7 +67,7 @@ dependencies { implementation "androidx.constraintlayout:constraintlayout:$constraint_layout_version" implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version" implementation "androidx.navigation:navigation-ui-ktx:$navigation_version" - implementation "androidx.preference:preference:$preference_version" + implementation "androidx.preference:preference-ktx:$preference_version" implementation "androidx.room:room-runtime:$room_version" implementation "androidx.room:room-ktx:$room_version" kapt "androidx.room:room-compiler:$room_version" @@ -80,7 +80,6 @@ dependencies { implementation "com.squareup.retrofit2:retrofit:$retrofit_version" implementation "com.squareup.retrofit2:converter-moshi:$retrofit_version" - implementation "com.github.AppIntro:AppIntro:$app_intro_version" implementation "org.osmdroid:osmdroid-android:$osmdroid_version" implementation "com.github.davidmoten:predict4java:$predict4java_version" } diff --git a/build.gradle b/build.gradle index efab7958..85144e24 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ buildscript { ext { - gradle_version = '4.0.2' + gradle_version = '4.1.0' gradle_plugin_version = '1.4.10' material_version = '1.2.1' constraint_layout_version = '2.0.2' @@ -29,14 +29,12 @@ buildscript { hilt_version = '2.29.1-alpha' hilt_viewmodel_version = '1.0.0-alpha02' retrofit_version = '2.9.0' - app_intro_version = '6.0.0' osmdroid_version = '6.1.8' predict4java_version = '1.3.1' } repositories { google() jcenter() - maven { url "https://jitpack.io" } } dependencies { classpath "com.android.tools.build:gradle:$gradle_version" @@ -50,7 +48,6 @@ allprojects { repositories { google() jcenter() - maven { url "https://jitpack.io" } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8f0588cc..f3bbd5ae 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,26 +1,6 @@ -# -# Look4Sat. Amateur radio and weather satellite tracker and passes predictor for Android. -# 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. -# - -#Mon Feb 24 22:26:03 GMT 2020 +#Mon Oct 12 23:30:44 BST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip -distributionSha256Sum=abc10bcedb58806e8654210f96031db541bcd2d6fc3161e81cb0572d6a15e821 +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip