Update gradle plugin and wrapper versions (#344)

* Update gradle plugin and wrapper versions * Fix github build action by installing ndk version 21.0.6113669 * Fix android lint issues * Small improvement
vase4kin · May 30, 2020 · 0bedec9 · 0bedec9
1 parent 31c5cfb
commit 0bedec9
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 79 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
         java-version: 1.8
 
     - name: Install NDK
-      run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;20.0.5594570" --sdk_root=${ANDROID_SDK_ROOT}
+      run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.0.6113669" --sdk_root=${ANDROID_SDK_ROOT}
 
     - name: Copy google-services jsons
       run: |

diff --git a/app/build.gradle b/app/build.gradle
@@ -28,7 +28,6 @@ apply plugin: 'org.jmailen.kotlinter'
 apply plugin: 'com.google.android.gms.oss-licenses-plugin'
 apply from: '../scripts/jacoco.gradle'
 apply from: '../scripts/pmd.gradle'
-apply from: '../scripts/findbugs.gradle'
 
 android {
     defaultConfig {

diff --git a/app/src/main/res/layout/header_default.xml b/app/src/main/res/layout/header_default.xml
@@ -19,11 +19,13 @@
 <HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="48dp"
+    android:layout_height="@dimen/dp_48"
     android:fillViewport="true">
 
     <TextView
         style="@style/Header"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
         tools:text="Header" />
 
 </HorizontalScrollView>
diff --git a/buildSrc/src/main/kotlin/teamcityapp/buildsrc/Dependencies.kt b/buildSrc/src/main/kotlin/teamcityapp/buildsrc/Dependencies.kt
@@ -158,7 +158,7 @@ object Libs {
     }
 
     object Tools {
-        const val gradleAndroid = "com.android.tools.build:gradle:3.6.1"
+        const val gradleAndroid = "com.android.tools.build:gradle:4.0.0"
         const val gradleversions = "com.github.ben-manes:gradle-versions-plugin:0.21.0"
         const val androidAapt = "com.neenbedankt.gradle.plugins:android-apt:1.8"
         const val googleServices = "com.google.gms:google-services:4.3.0"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/libraries/theme/src/main/res/values/styles.xml b/libraries/theme/src/main/res/values/styles.xml
@@ -86,8 +86,6 @@
 
     <style name="Header">
         <item name="android:id">@id/section_text</item>
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">@dimen/dp_48</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:paddingLeft">@dimen/dp_16</item>
         <item name="android:paddingRight">@dimen/dp_16</item>

diff --git a/scripts/findbugs.gradle b/scripts/findbugs.gradle
diff --git a/scripts/findbugs_exclude.xml b/scripts/findbugs_exclude.xml
diff --git a/scripts/jacoco.gradle b/scripts/jacoco.gradle
@@ -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.
@@ -65,10 +65,10 @@ task generateCodeCoverageReport(type: JacocoReport) {
                            'coverage.ec'])
     }
 
-    sourceDirectories = files([javaSrc, kotlinSrc])
-    classDirectories = files([javaClasses, kotlinClasses])
+    getSourceDirectories().setFrom(files([javaSrc, kotlinSrc]))
+    getClassDirectories().setFrom(files([javaClasses, kotlinClasses]))
 
-    executionData = files(execution)
+    getExecutionData().setFrom(files(execution))
 
     doLast() {
         print "file://${reports.html.destination}/index.html"