Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit e7b807c7 authored by dependabot-preview[bot]'s avatar dependabot-preview[bot] Committed by tobiasKaminsky
Browse files

Bump gradle from 3.6.3 to 4.0.0 



Bumps gradle from 3.6.3 to 4.0.0.

Signed-off-by: default avatardependabot-preview[bot] <support@dependabot.com>
Signed-off-by: default avatartobiasKaminsky <tobias@kaminsky.me>
parent eb360415

build.gradle

+10 −15
Original line number Diff line number Diff line 
import com.github.spotbugs.SpotBugsTask

import com.github.spotbugs.snom.SpotBugsTask



buildscript {

    ext {
@@ -16,9 +16,9 @@ buildscript { 
        mavenCentral()

    }

    dependencies {

        classpath 'com.android.tools.build:gradle:3.6.3'

        classpath 'com.android.tools.build:gradle:4.0.0'

        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'

        classpath 'gradle.plugin.com.github.spotbugs:spotbugs-gradle-plugin:1.6.6'

        classpath 'gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.4.4'

        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

        classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.9.1"

    }
@@ -45,11 +45,11 @@ configurations { 
}



android {

    compileSdkVersion 28

    buildToolsVersion '28.0.3'

    compileSdkVersion 29

    buildToolsVersion "29.0.3"

    defaultConfig {

        minSdkVersion 14

        targetSdkVersion 28

        targetSdkVersion 29

        versionCode 1

        versionName '1.0'

    }
@@ -82,22 +82,17 @@ android { 
    productFlavors {

    }



    tasks.register("spotbugsDebug", SpotBugsTask) {

        ignoreFailures = false

    tasks.register("spotbugsDebugReport", SpotBugsTask) {

        ignoreFailures = true

        effort = "max"

        reportLevel = "medium"

        classes = fileTree("$project.buildDir/intermediates/javac/debug/classes/")

        excludeFilter = file("${project.rootDir}/spotbugs-filter.xml")

        pluginClasspath = project.configurations.spotbugsPlugins

        source = fileTree('src/main/java')

        classpath = files()

        include '**/*.java'

        exclude '**/gen/**'



        reports {

            xml.enabled = false

            html.enabled = true

            html {

                enabled = true

                destination = file("$project.buildDir/reports/spotbugs/spotbugs.html")

            }

        }

gradle/wrapper/gradle-wrapper.properties

+1 −1
Original line number Diff line number Diff line
@@ -3,4 +3,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

lint.xml

0 → 100644
+6 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<lint>

    <issue id="ObsoleteLintCustomCheck" severity="warning">

        <ignore path="**/fragment-1.2.5/**/lint.jar" />

    </issue>

</lint>

scripts/analysis/findbugs-up.rb

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ require 'xmlsimple' 
# run FindBugs

puts "running FindBugs..."

system './gradlew assembleDebug'

system './gradlew spotbugsDebug'

system './gradlew spotbugsDebugReport'



# find FindBugs report file

findbugs_reports = Dir.glob(FINDBUGS_REPORT_FILE)