From 8675e4b54d936df7e18221e4f61d0361d82ced7f Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Tue, 13 Aug 2019 14:54:33 +0100 Subject: [PATCH] #1319 Lint Issue: SyntheticAccessor --- app/build.gradle | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 61206e82d..d08678de0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -126,7 +126,6 @@ dependencies { // Leak canary debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0-alpha-2' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion" implementation "android.arch.lifecycle:extensions:1.1.1" implementation "io.objectbox:objectbox-kotlin:$objectboxVersion" @@ -152,9 +151,9 @@ if (custom.listFiles()) { def fileName = file.getName() if (fileName.startsWith(".") || - fileName.contains("test") || - fileName == "main" || - fileName.contains("Test")) { + fileName.contains("test") || + fileName == "main" || + fileName.contains("Test")) { return } map.put(fileName, file.getAbsolutePath()) @@ -170,8 +169,8 @@ tasks.withType(Test) { } def branchName = System.getenv('TRAVIS_PULL_REQUEST') ?: "false" == "false" - ? System.getenv('TRAVIS_BRANCH') ?: "local" - : System.getenv('TRAVIS_PULL_REQUEST_BRANCH') + ? System.getenv('TRAVIS_BRANCH') ?: "local" + : System.getenv('TRAVIS_PULL_REQUEST_BRANCH') def buildNumber = System.getenv('TRAVIS_BUILD_NUMBER') ?: "dev" ext { @@ -198,9 +197,9 @@ private String generateVersionName() { private Integer generateVersionCode() { 20 * 10000 + - (ext.versionMajor * 10000) + - (ext.versionMinor * 100) + - (ext.versionPatch) + (ext.versionMajor * 10000) + + (ext.versionMinor * 100) + + (ext.versionPatch) } android { @@ -228,12 +227,15 @@ android { abortOnError true checkAllWarnings true warningsAsErrors true - //TODO stop ignoring - ignore 'MissingTranslation', - 'CheckResult', - 'LabelFor', - 'DuplicateStrings', - 'LogConditional' + + ignore 'SyntheticAccessor', + //TODO stop ignoring below this + 'MissingTranslation', + 'CheckResult', + 'LabelFor', + 'DuplicateStrings', + 'LogConditional' + warning 'UnknownNullness', 'SelectableText', 'IconDensities' @@ -437,9 +439,9 @@ android { def baseAbiVersionCode = abiCodes.get(output.getFilter(OutputFile.ABI)) ?: 0 def baseDensityVersionCode = densityCodes.get(output.getFilter(OutputFile.DENSITY)) ?: 1 output.versionCodeOverride = - (baseDensityVersionCode * 10000000) + - (baseAbiVersionCode * 1000000) + - variant.versionCode + (baseDensityVersionCode * 10000000) + + (baseAbiVersionCode * 1000000) + + variant.versionCode } } } @@ -452,7 +454,7 @@ play { resolutionStrategy = "fail" } -ktlint{ +ktlint { android = true } @@ -474,7 +476,7 @@ class TestDroidUpload extends TestServer { System.out.println(id) try { delegate.postResource(createUri(selfURI, "/files/" + id + "/share"), - [accessGroupId: accessGroup], APIProject.class) + [accessGroupId: accessGroup], APIProject.class) } catch (Exception e) { System.out.println(e.getLocalizedMessage()) } @@ -488,7 +490,7 @@ class TestDroidUpload extends TestServer { user.shareFile(testedId, accessGroup) new URL(RUNNER_GATEWAY + "?apk=" + testedId + "&test=" + testId + "&buildno=" + buildNumber). - getText() + getText() } @Override