TouchInstinct
/
BuildScripts
306
0
Fork 0
Code Issues Pull Requests 4 Packages Projects Releases Wiki Activity

Merge branch 'master' into static

This commit is contained in:
Denis Karmyshakov 2018-09-27 13:57:50 +03:00
parent 3fe4b2a1ae ea12763627
commit 3b7f4684a1
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gradle/apiGenerator.gradle
View File

@ -7,7 +7,7 @@ configurations {
}
dependencies {
apigenerator 'ru.touchin:api-generator:1.1.26'
apigenerator 'ru.touchin:api-generator:1.1.33'
}
android.applicationVariants.all { variant ->
@ -24,7 +24,7 @@ android.applicationVariants.all { variant ->
jarArgs.add("--output-path")
jarArgs.add("${generatedModelsDirectory.path}")
jarArgs.add("--package-name")
jarArgs.add("${applicationId}")
jarArgs.add("${rootProject.extensions.findByName("applicationId") ?: applicationId}")
javaexec { main = "-jar"; args = jarArgs; workingDir = file("${rootDir}") }
}

2
lint/lint.xml
View File

@ -132,7 +132,6 @@
<issue id="AllowBackup" severity="error"/>
<issue id="AlwaysShowAction" severity="error"/>
<issue id="AppCompatMethod" severity="error"/>
<issue id="AppIndexingApiWarning" severity="error"/>
<issue id="Assert" severity="error"/>
<issue id="CommitPrefEdits" severity="error"/>
<issue id="CommitTransaction" severity="error"/>
@ -221,7 +220,6 @@
<!-- DISABLE RULES BELOW -->
<issue id="GoogleAppIndexingApiWarning" severity="ignore"/>
<issue id="GoogleAppIndexingUrlError" severity="ignore"/>
<issue id="GoogleAppIndexingWarning" severity="ignore"/>
<issue id="AppLinksAutoVerifyError" severity="ignore"/>
<issue id="AppLinksAutoVerifyWarning" severity="ignore"/>