From 505c98b156bdf92d075fe9e067f92255d01a89d7 Mon Sep 17 00:00:00 2001 From: Arty Bishop Date: Sun, 15 Dec 2019 12:11:05 +0000 Subject: [PATCH] Added licences library dep, removed workManager dep as not needed --- app/build.gradle | 28 ++++++++++++++++++++++++++-- build.gradle | 29 +++++++++++++++++++++++++---- 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 44387fe4..bd2f5dd4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,27 @@ +/* + * LookingSat. Amateur radio & weather satellite tracker and passes calculator. + * Copyright (C) 2019 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. + */ + apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' +apply plugin: 'com.google.android.gms.oss-licenses-plugin' android { compileSdkVersion 29 @@ -31,7 +51,6 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "com.google.android.material:material:$material" implementation "androidx.appcompat:appcompat:$supportLib" implementation "androidx.legacy:legacy-support-v4:$supportLib" @@ -47,7 +66,9 @@ dependencies { implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle" implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle" - implementation "androidx.work:work-runtime-ktx:$work" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle" + + // room implementation "androidx.room:room-runtime:$room" implementation "androidx.room:room-ktx:$room" kapt "androidx.room:room-compiler:$room" @@ -70,4 +91,7 @@ dependencies { testImplementation "junit:junit:$junit" androidTestImplementation "androidx.test:runner:$runner" androidTestImplementation "androidx.test.espresso:espresso-core:$espresso" + + // licences + implementation "com.google.android.gms:play-services-oss-licenses:$licences" } diff --git a/build.gradle b/build.gradle index e6112d43..f2e07728 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,34 @@ +/* + * LookingSat. Amateur radio & weather satellite tracker and passes calculator. + * Copyright (C) 2019 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. + */ + // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.61' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.3' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "com.android.tools.build:gradle:3.5.3" + classpath "com.google.android.gms:oss-licenses-plugin:0.10.0" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61" } } @@ -34,7 +53,7 @@ ext { navigation = '2.1.0' lifecycle = '2.2.0-rc03' - work = '2.2.0' + room = '2.2.2' retrofit = '2.6.2' @@ -48,4 +67,6 @@ ext { junit = "4.12" runner = '1.1.1' espresso = '3.2.0' + + licences = '17.0.0' }