diff options
author | Gautam Korlam <gkorlam@uber.com> | 2016-12-19 19:48:55 -0800 |
---|---|---|
committer | Gautam Korlam <gkorlam@uber.com> | 2016-12-19 19:48:55 -0800 |
commit | 563fe99dee9a1afe48a5513943941f435d9db629 (patch) | |
tree | 9abfcc5ec37d4fdc308fbfd0512742109e0a1db0 | |
parent | fd62eab4a45e04fe9c5da6328b4d59ddbcaa8209 (diff) | |
download | android-studio-gradle-test-563fe99dee9a1afe48a5513943941f435d9db629.tar.gz |
Remove butterknife, update versions
113 files changed, 128 insertions, 218 deletions
diff --git a/.buckversion b/.buckversion index cf269f2..74cc716 100644 --- a/.buckversion +++ b/.buckversion @@ -1 +1 @@ -22840aa89e27ee0a01bd458843cc02845e86e670 +2221f806fe81b4b639d4e4b5d1eacc5ff5f9a6cc diff --git a/Padraig/arbitrate/build.gradle b/Padraig/arbitrate/build.gradle index 7e8cbed..1f75eaa 100644 --- a/Padraig/arbitrate/build.gradle +++ b/Padraig/arbitrate/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile project(':outissue:synarchy') compile project(':Padraig:follicle') diff --git a/Padraig/cuminoin/build.gradle b/Padraig/cuminoin/build.gradle index 5c0e261..053a551 100644 --- a/Padraig/cuminoin/build.gradle +++ b/Padraig/cuminoin/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile project(':Padraig:follicle') } diff --git a/Padraig/decollete/build.gradle b/Padraig/decollete/build.gradle index f29020f..a3c9be6 100644 --- a/Padraig/decollete/build.gradle +++ b/Padraig/decollete/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile project(':subvola:remigrate') compile project(':subvola:gorgoneum:unwincing') diff --git a/Padraig/emerse/build.gradle b/Padraig/emerse/build.gradle index 203f243..e7ad57c 100644 --- a/Padraig/emerse/build.gradle +++ b/Padraig/emerse/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile deps.support.annotations compile deps.support.appCompat diff --git a/Padraig/endocoele/build.gradle b/Padraig/endocoele/build.gradle index 4b5d16c..3af55a5 100644 --- a/Padraig/endocoele/build.gradle +++ b/Padraig/endocoele/build.gradle @@ -1,6 +1,5 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { - annotationProcessor deps.apt.butterKnifeCompiler annotationProcessor deps.other.recyclerview annotationProcessor deps.apt.daggerCompiler annotationProcessor deps.other.appcompat @@ -34,14 +33,14 @@ dependencies { compile project(':outissue:worldway') compile project(':outissue:eyesore') compile project(':outissue:extended') - compile project(':outissue:stupendly'); - compile project(':outissue:nonparty'); + compile project(':outissue:stupendly') + compile project(':outissue:nonparty') compile project(':outissue:nursing') compile project(':outissue:caricetum:midship') compile project(':outissue:caricetum:skiapod') compile project(':outissue:situla') compile project(':outissue:aricine') - compile project(':outissue:tristate'); + compile project(':outissue:tristate') compile project(':outissue:defusion') compile project(':outissue:carnally') compile project(':fratry:psoriasis') @@ -73,12 +72,10 @@ dependencies { compile deps.other.rave compile deps.other.support compile deps.other.fresco - compile deps.other.butterknife compile deps.other.mvp compile deps.other.reflections compile deps.other.facebook compile deps.other.utils - compile deps.other.bkCompiler compile deps.other.calligraphy compile deps.other.guava compile deps.other.picasso @@ -86,7 +83,6 @@ dependencies { compile deps.other.javax compile deps.other.javaxInject compile deps.other.javapoet - compile deps.other.bkCompiler compile deps.other.crittercism compile deps.other.location compile deps.other.rxbinding diff --git a/Padraig/follicle/build.gradle b/Padraig/follicle/build.gradle index 0e9ca55..16fdd6f 100644 --- a/Padraig/follicle/build.gradle +++ b/Padraig/follicle/build.gradle @@ -1,7 +1,5 @@ -apply plugin: 'com.android.library'; -apply plugin: 'com.jakewharton.butterknife' +apply plugin: 'com.android.library' dependencies { - annotationProcessor deps.apt.butterKnifeCompiler annotationProcessor deps.other.recyclerview annotationProcessor deps.apt.daggerCompiler annotationProcessor deps.other.appcompat @@ -54,14 +52,14 @@ dependencies { compile project(':outissue:worldway') compile project(':outissue:eyesore') compile project(':outissue:extended') - compile project(':outissue:stupendly'); - compile project(':outissue:nonparty'); + compile project(':outissue:stupendly') + compile project(':outissue:nonparty') compile project(':outissue:nursing') compile project(':outissue:caricetum:midship') compile project(':outissue:caricetum:skiapod') compile project(':outissue:situla') compile project(':outissue:aricine') - compile project(':outissue:tristate'); + compile project(':outissue:tristate') compile project(':outissue:defusion') compile project(':outissue:carnally') compile project(':harvestry:Timbira') @@ -93,12 +91,10 @@ dependencies { compile deps.other.rave compile deps.other.support compile deps.other.fresco - compile deps.other.butterknife compile deps.other.mvp compile deps.other.reflections compile deps.other.facebook compile deps.other.utils - compile deps.other.bkCompiler compile deps.other.calligraphy compile deps.other.guava compile deps.other.picasso @@ -106,7 +102,6 @@ dependencies { compile deps.other.javax compile deps.other.javaxInject compile deps.other.javapoet - compile deps.other.bkCompiler compile deps.other.crittercism compile deps.other.location compile deps.other.rxbinding diff --git a/Padraig/limitary/build.gradle b/Padraig/limitary/build.gradle index c84b8b5..8b9f8b5 100644 --- a/Padraig/limitary/build.gradle +++ b/Padraig/limitary/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile project(':outissue:proctoral') compile deps.support.annotations diff --git a/Padraig/paegle/build.gradle b/Padraig/paegle/build.gradle index b8ad930..d16fcb1 100644 --- a/Padraig/paegle/build.gradle +++ b/Padraig/paegle/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile project(':outissue:worldway') compile project(':outissue:stupendly') diff --git a/Padraig/quaestor/triduum/build.gradle b/Padraig/quaestor/triduum/build.gradle index 37bc3f8..be3df1f 100644 --- a/Padraig/quaestor/triduum/build.gradle +++ b/Padraig/quaestor/triduum/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile project(':outissue:phasmatid') compile deps.support.annotations diff --git a/Padraig/ratafee/build.gradle b/Padraig/ratafee/build.gradle index 9b24ab0..845cb41 100644 --- a/Padraig/ratafee/build.gradle +++ b/Padraig/ratafee/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor deps.apt.daggerCompiler @@ -11,7 +11,6 @@ dependencies { compile deps.external.dagger compile deps.external.timber compile deps.other.exo - compile deps.other.butterknife compile deps.other.autoValueGson provided deps.apt.javax diff --git a/Padraig/signist/build.gradle b/Padraig/signist/build.gradle index 1ba483f..6392eba 100644 --- a/Padraig/signist/build.gradle +++ b/Padraig/signist/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile project(':Padraig:ratafee') compile project(':outissue:nutate') diff --git a/Tripoline/build.gradle b/Tripoline/build.gradle index d1a03ab..362ac49 100644 --- a/Tripoline/build.gradle +++ b/Tripoline/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.application'; +apply plugin: 'com.android.application' dependencies { annotationProcessor deps.other.recyclerview annotationProcessor deps.apt.daggerCompiler @@ -6,12 +6,12 @@ dependencies { annotationProcessor project(':outissue:caricetum:Chelura') compile project(':outissue:nutate') - compile project(':outissue:worldway'); + compile project(':outissue:worldway') compile project(':outissue:bracciale') compile project(':outissue:oleometer') compile project(':outissue:airified') compile project(':outissue:caricetum:midship') - compile project(':outissue:tristate'); + compile project(':outissue:tristate') compile project(':outissue:defusion') compile project(':outissue:carnally') diff --git a/build.gradle b/build.gradle index 55c9d6f..76150b0 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,6 @@ buildscript { classpath ('com.uber:okbuck:0.13.0') { exclude module: 'gradle' } - classpath 'com.jakewharton:butterknife-gradle-plugin:8.4.0' } } @@ -117,9 +116,6 @@ def addCommonConfigurationForAndroidModules(Project project) { abortOnError false } } - if (hasDependency(project, "butterknife-8")) { - project.plugins.apply('com.jakewharton.butterknife') - } } apply plugin: 'com.uber.okbuck' @@ -171,20 +167,10 @@ task addSources { def activityClass = new File(sourceFolder, "main/java/gradle/example/LoginActivity.java") - def hasButterknife = hasDependency(it, "butterknife-8") - def hasAutoService = hasDependency(it, "auto-service"); - def hasButterknifePlugin = it.plugins.hasPlugin('com.jakewharton.butterknife') - + def hasAutoService = hasDependency(it, "auto-service") if (!hasAutoService) { new File(sourceFolder, "main/java/gradle/example/Service.java").delete() } - if (!hasButterknife || (!hasButterknifePlugin && it.plugins.hasPlugin('com.android.library'))) { - activityClass.text = activityClass.text.replace("@butterknife.BindView(R.id.login_form)", "") - } - - if (hasButterknife && hasButterknifePlugin) { - activityClass.text = activityClass.text.replace("@butterknife.BindView(R.id.login_form)", "@butterknife.BindView(R2.id.login_form)") - } adjustPackage(it, "LoginActivity") if (hasAutoService) { @@ -202,11 +188,11 @@ boolean hasDependency(Project project, String name) { def adjustPackage(Project project, String className) { def sourceFolder = new File(project.projectDir, 'src') def sourceFile = new File(sourceFolder, "main/java/gradle/example/${className}.java") - def manifest = new File(sourceFolder, "main/AndroidManifest.xml").text; + def manifest = new File(sourceFolder, "main/AndroidManifest.xml").text def projectPackage = manifest.substring(manifest.indexOf('package="') + 9, manifest.indexOf('" xmlns:android')) - def exampleClassFolder = new File(sourceFolder, "main/java/${projectPackage.replace('.', '/')}"); - exampleClassFolder.mkdirs(); + def exampleClassFolder = new File(sourceFolder, "main/java/${projectPackage.replace('.', '/')}") + exampleClassFolder.mkdirs() sourceFile.text = sourceFile.text.replaceAll("package gradle.example;", "package ${projectPackage};") sourceFile.renameTo(new File(exampleClassFolder, "${className}.java")) diff --git a/dependencies.gradle b/dependencies.gradle index 9e6b5b6..a993c23 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,6 +1,5 @@ def versions = [ androidToolsVersion: '25.3.0-beta1', - butterKnifeVersion : '8.4.0', daggerVersion : '2.8', leakCanaryVersion : '1.5', playServicesVersion: '10.0.1', @@ -30,7 +29,6 @@ def annotationProcessor = [ autoService : 'com.google.auto.service:auto-service:1.0-rc2', autoValue : 'com.google.auto.value:auto-value:1.4-rc1', autoValueAnnotations: 'com.jakewharton.auto.value:auto-value-annotations:1.2-update1', - butterKnifeCompiler : "com.jakewharton:butterknife-compiler:${versions.butterKnifeVersion}", daggerCompiler : "com.google.dagger:dagger-compiler:${versions.daggerVersion}", javax : 'javax.inject:javax.inject:1', javaxInject : 'javax.inject:javax.inject:1', @@ -51,7 +49,6 @@ def external = [ android : 'com.google.android:android:4.1.1.4', braintree : 'com.braintreepayments:encryption:2.1.0', braintreesdk : 'com.braintreepayments.api:braintree:2.3.6', - butterKnife : "com.jakewharton:butterknife:${versions.butterKnifeVersion}", calligraphy : 'uk.co.chrisjenx:calligraphy:2.2.0', dagger : "com.google.dagger:dagger:${versions.daggerVersion}", deviceYearClass: 'com.facebook.device.yearclass:yearclass:1.0.1', @@ -140,7 +137,6 @@ def other = [ rave : 'com.uber:rave:0.6.0', support : 'com.jakewharton.rxbinding:rxbinding-support-v4:0.4.0', fresco : 'com.facebook.fresco:fresco:0.11.0', - butterknife : 'com.jakewharton:butterknife:8.2.1', mvp : 'com.hannesdorfmann.mosby:mvp:2.0.1', espresso : "com.android.support.test.espresso:espresso-core:2.2.2", burst : "com.squareup.burst:burst-junit4:1.1.0", @@ -175,7 +171,6 @@ def other = [ javaxInject : 'javax.inject:javax.inject:1', javapoet : 'com.squareup:javapoet:1.7.0', raveCompiler : 'com.uber:rave-compiler:0.6.0', - bkCompiler : 'com.jakewharton:butterknife-compiler:8.2.1', ] ext.config = [ diff --git a/fratry/Cosmati/build.gradle b/fratry/Cosmati/build.gradle index 96afc01..316a565 100644 --- a/fratry/Cosmati/build.gradle +++ b/fratry/Cosmati/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor deps.other.recyclerview annotationProcessor deps.apt.daggerCompiler diff --git a/fratry/Krapina/build.gradle b/fratry/Krapina/build.gradle index 1cb5157..1d133f8 100644 --- a/fratry/Krapina/build.gradle +++ b/fratry/Krapina/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor deps.apt.daggerCompiler diff --git a/fratry/Ormond/build.gradle b/fratry/Ormond/build.gradle index 4fb67a0..716315a 100644 --- a/fratry/Ormond/build.gradle +++ b/fratry/Ormond/build.gradle @@ -1,7 +1,6 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile project(':outissue:extended') - compile deps.other.butterknife testCompile deps.other.leanback } diff --git a/fratry/assumpsit/build.gradle b/fratry/assumpsit/build.gradle index 143f3c1..6983586 100644 --- a/fratry/assumpsit/build.gradle +++ b/fratry/assumpsit/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile deps.external.rxjava compile deps.external.rxrelay diff --git a/fratry/asteep/build.gradle b/fratry/asteep/build.gradle index 5eedf83..164b4f1 100644 --- a/fratry/asteep/build.gradle +++ b/fratry/asteep/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile deps.external.rxjava compile deps.external.rxrelay diff --git a/fratry/audience/build.gradle b/fratry/audience/build.gradle index 96e4102..34cef9a 100644 --- a/fratry/audience/build.gradle +++ b/fratry/audience/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile project(':outissue:extended') compile project(':fratry:endothys') diff --git a/fratry/cepaceous/build.gradle b/fratry/cepaceous/build.gradle index d48c84b..14bc286 100644 --- a/fratry/cepaceous/build.gradle +++ b/fratry/cepaceous/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor deps.apt.daggerCompiler annotationProcessor deps.other.appcompat diff --git a/fratry/crankum/build.gradle b/fratry/crankum/build.gradle index ec76fc3..32e04d0 100644 --- a/fratry/crankum/build.gradle +++ b/fratry/crankum/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor project(':outissue:caricetum:handbolt') annotationProcessor project(':outissue:caricetum:Chelura') diff --git a/fratry/crapple/build.gradle b/fratry/crapple/build.gradle index 2288fb4..6faa4d5 100644 --- a/fratry/crapple/build.gradle +++ b/fratry/crapple/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor deps.other.recyclerview @@ -6,7 +6,7 @@ dependencies { compile project(':fratry:matchy') compile project(':fratry:linotype') compile project(':outissue:edictally') - compile project(':outissue:tristate'); + compile project(':outissue:tristate') compile deps.external.rxjava compile deps.external.rxrelay compile deps.other.crittercism diff --git a/fratry/crippling/build.gradle b/fratry/crippling/build.gradle index 63b54cc..7ed6443 100644 --- a/fratry/crippling/build.gradle +++ b/fratry/crippling/build.gradle @@ -1,16 +1,15 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor deps.apt.daggerCompiler annotationProcessor project(':outissue:caricetum:handbolt') annotationProcessor project(':outissue:caricetum:Chelura') compile project(':outissue:tetragram') - compile project(':outissue:stupendly'); + compile project(':outissue:stupendly') compile project(':outissue:caricetum:midship') compile project(':outissue:phasmatid') compile project(':outissue:tristate') compile deps.other.geo compile deps.external.dagger - compile deps.other.butterknife compile deps.other.utils compile deps.other.dagger provided deps.other.roasterJdt diff --git a/fratry/endothys/build.gradle b/fratry/endothys/build.gradle index ef98e18..1b0d357 100644 --- a/fratry/endothys/build.gradle +++ b/fratry/endothys/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile project(':Padraig:ratafee') compile project(':outissue:extended') @@ -6,9 +6,7 @@ dependencies { annotationProcessor deps.other.recyclerview annotationProcessor deps.apt.daggerCompiler - compile deps.other.butterknife compile deps.other.utils - compile deps.other.butterknife compile deps.other.autoValueGson compile deps.external.rxjava diff --git a/fratry/fortunate/build.gradle b/fratry/fortunate/build.gradle index fcbcc99..90c88de 100644 --- a/fratry/fortunate/build.gradle +++ b/fratry/fortunate/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor deps.apt.daggerCompiler annotationProcessor project(':outissue:caricetum:handbolt') diff --git a/fratry/halsen/build.gradle b/fratry/halsen/build.gradle index 4e0c99a..af640e4 100644 --- a/fratry/halsen/build.gradle +++ b/fratry/halsen/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor deps.apt.daggerCompiler annotationProcessor deps.other.recyclerview diff --git a/fratry/linotype/build.gradle b/fratry/linotype/build.gradle index 8a6d4c2..022a5e4 100644 --- a/fratry/linotype/build.gradle +++ b/fratry/linotype/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor deps.other.recyclerview annotationProcessor deps.apt.daggerCompiler diff --git a/fratry/matchy/build.gradle b/fratry/matchy/build.gradle index 11eb3a0..306bce4 100644 --- a/fratry/matchy/build.gradle +++ b/fratry/matchy/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor deps.other.recyclerview diff --git a/fratry/passbook/build.gradle b/fratry/passbook/build.gradle index bcfed15..5e042ea 100644 --- a/fratry/passbook/build.gradle +++ b/fratry/passbook/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor deps.other.recyclerview annotationProcessor deps.other.appcompat @@ -9,10 +9,10 @@ dependencies { compile project(':outissue:nutate') compile project(':outissue:oleometer') compile project(':outissue:eyesore') - compile project(':outissue:stupendly'); + compile project(':outissue:stupendly') compile project(':outissue:situla') compile project(':outissue:aricine') - compile project(':outissue:tristate'); + compile project(':outissue:tristate') compile project(':outissue:defusion') compile deps.other.guava compile deps.other.rxlifecycle diff --git a/fratry/psoriasis/build.gradle b/fratry/psoriasis/build.gradle index 73fe525..fcfe856 100644 --- a/fratry/psoriasis/build.gradle +++ b/fratry/psoriasis/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor deps.apt.daggerCompiler compile project(':fratry:asteep') @@ -12,7 +12,6 @@ dependencies { compile deps.support.annotations compile deps.other.rxlifecycle compile deps.other.rxrelay - compile deps.other.bkCompiler compile deps.external.dagger compile deps.external.timber diff --git a/fratry/savory/build.gradle b/fratry/savory/build.gradle index c9823f6..c0ec80e 100644 --- a/fratry/savory/build.gradle +++ b/fratry/savory/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor deps.other.recyclerview annotationProcessor deps.apt.daggerCompiler diff --git a/fratry/sodden/build.gradle b/fratry/sodden/build.gradle index ce8063c..bd73873 100644 --- a/fratry/sodden/build.gradle +++ b/fratry/sodden/build.gradle @@ -1,9 +1,7 @@ -apply plugin: 'com.android.library'; -apply plugin: 'com.jakewharton.butterknife' +apply plugin: 'com.android.library' dependencies { annotationProcessor project(':outissue:caricetum:handbolt') annotationProcessor project(':outissue:caricetum:Chelura') - annotationProcessor deps.apt.butterKnifeCompiler annotationProcessor deps.apt.daggerCompiler annotationProcessor deps.other.recyclerview diff --git a/fratry/subradius/build.gradle b/fratry/subradius/build.gradle index 6794d21..bdd6ce6 100644 --- a/fratry/subradius/build.gradle +++ b/fratry/subradius/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile project(':outissue:nutate') compile project(':outissue:tristate') diff --git a/fratry/tentlet/build.gradle b/fratry/tentlet/build.gradle index fa237ee..2afb31c 100644 --- a/fratry/tentlet/build.gradle +++ b/fratry/tentlet/build.gradle @@ -1,7 +1,5 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { - compile deps.other.bkCompiler - compile project (':outissue:nonjurant') testCompile deps.other.leanback diff --git a/fratry/wiredraw/build.gradle b/fratry/wiredraw/build.gradle index b3d4f28..89588f4 100644 --- a/fratry/wiredraw/build.gradle +++ b/fratry/wiredraw/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor project(':outissue:caricetum:handbolt') annotationProcessor project(':outissue:caricetum:Chelura') diff --git a/gradle/SourceTemplate/app/build.gradle b/gradle/SourceTemplate/app/build.gradle index aab80ce..d206d43 100644 --- a/gradle/SourceTemplate/app/build.gradle +++ b/gradle/SourceTemplate/app/build.gradle @@ -21,12 +21,9 @@ android { dependencies { compile "com.google.dagger:dagger-compiler:2.7" - // annotationProcessor command comes from the android-annotationProcessor plugin annotationProcessor 'com.google.dagger:dagger-compiler:2.7' compile 'com.google.dagger:dagger:2.7' provided 'javax.annotation:jsr250-api:1.0' - compile 'com.jakewharton:butterknife:8.4.0' - annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0' compile 'com.google.auto.service:auto-service:1.0-rc2' compile 'com.google.auto.value:auto-value:1.3-rc2' } diff --git a/gradle/SourceTemplate/app/src/main/java/gradle/example/LoginActivity.java b/gradle/SourceTemplate/app/src/main/java/gradle/example/LoginActivity.java index 3540907..51cf6f7 100644 --- a/gradle/SourceTemplate/app/src/main/java/gradle/example/LoginActivity.java +++ b/gradle/SourceTemplate/app/src/main/java/gradle/example/LoginActivity.java @@ -58,15 +58,14 @@ public class LoginActivity extends Activity implements LoaderCallbacks<Cursor> { private AutoCompleteTextView mEmailView; private EditText mPasswordView; private View mProgressView; - - @butterknife.BindView(R.id.login_form) - View mLoginFormView; + private View mLoginFormView; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_login); // Set up the login form. + mLoginFormView = findViewById(R.id.login_form); mEmailView = (AutoCompleteTextView) findViewById(R.id.email); populateAutoComplete(); diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 45a226c..85f2d13 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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-3.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-rc-1-all.zip diff --git a/harvestry/Bokhara/build.gradle b/harvestry/Bokhara/build.gradle index 9e009e1..f611a0a 100644 --- a/harvestry/Bokhara/build.gradle +++ b/harvestry/Bokhara/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.application'; +apply plugin: 'com.android.application' dependencies { annotationProcessor deps.apt.daggerCompiler annotationProcessor deps.other.recyclerview diff --git a/harvestry/Savannah/penumbra/build.gradle b/harvestry/Savannah/penumbra/build.gradle index 8f80d73..bafc3ad 100644 --- a/harvestry/Savannah/penumbra/build.gradle +++ b/harvestry/Savannah/penumbra/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.application'; +apply plugin: 'com.android.application' dependencies { compile project(':subvola:gorgoneum:teerer:revalenta') } diff --git a/harvestry/Timbira/build.gradle b/harvestry/Timbira/build.gradle index d276da1..0285f2e 100644 --- a/harvestry/Timbira/build.gradle +++ b/harvestry/Timbira/build.gradle @@ -1,10 +1,7 @@ -apply plugin: 'com.android.library'; -apply plugin: 'com.jakewharton.butterknife' +apply plugin: 'com.android.library' dependencies { - annotationProcessor deps.apt.butterKnifeCompiler compile project(':outissue:carnally') compile project(':outissue:Glumaceae') - compile deps.external.butterKnife compile deps.external.rxjava compile deps.other.retrofit testCompile deps.other.leanback diff --git a/harvestry/digallate/build.gradle b/harvestry/digallate/build.gradle index 4174ed4..1dbf656 100644 --- a/harvestry/digallate/build.gradle +++ b/harvestry/digallate/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.application'; +apply plugin: 'com.android.application' dependencies { annotationProcessor deps.other.recyclerview annotationProcessor deps.apt.daggerCompiler diff --git a/harvestry/eelgrass/build.gradle b/harvestry/eelgrass/build.gradle index b99c140..363d570 100644 --- a/harvestry/eelgrass/build.gradle +++ b/harvestry/eelgrass/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.application'; +apply plugin: 'com.android.application' dependencies { releaseCompile project(':Padraig:cuminoin') debugCompile project(':Padraig:arbitrate') diff --git a/harvestry/isocryme/build.gradle b/harvestry/isocryme/build.gradle index 18d1031..1ccbe2d 100644 --- a/harvestry/isocryme/build.gradle +++ b/harvestry/isocryme/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.application'; +apply plugin: 'com.android.application' dependencies { annotationProcessor deps.other.recyclerview annotationProcessor deps.apt.daggerCompiler diff --git a/harvestry/suchness/build.gradle b/harvestry/suchness/build.gradle index aa07a91..b9634d8 100644 --- a/harvestry/suchness/build.gradle +++ b/harvestry/suchness/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.application'; +apply plugin: 'com.android.application' dependencies { annotationProcessor deps.other.recyclerview annotationProcessor deps.apt.daggerCompiler diff --git a/harvestry/thribble/build.gradle b/harvestry/thribble/build.gradle index 39815e8..cb21f87 100644 --- a/harvestry/thribble/build.gradle +++ b/harvestry/thribble/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.application'; +apply plugin: 'com.android.application' dependencies { annotationProcessor deps.apt.daggerCompiler annotationProcessor project(':outissue:caricetum:handbolt') diff --git a/harvestry/unwormy/build.gradle b/harvestry/unwormy/build.gradle index 7eaa68f..7026cc6 100644 --- a/harvestry/unwormy/build.gradle +++ b/harvestry/unwormy/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.application'; +apply plugin: 'com.android.application' dependencies { compile project(':harvestry:Timbira') compile project(':outissue:carnally') diff --git a/outissue/Glumaceae/build.gradle b/outissue/Glumaceae/build.gradle index 77fe399..f5f15e0 100644 --- a/outissue/Glumaceae/build.gradle +++ b/outissue/Glumaceae/build.gradle @@ -1,10 +1,6 @@ -apply plugin: 'com.android.library'; -apply plugin: 'com.jakewharton.butterknife' +apply plugin: 'com.android.library' dependencies { compile project(':outissue:carnally') - annotationProcessor deps.apt.butterKnifeCompiler - - compile deps.external.butterKnife testCompile deps.other.leanback } diff --git a/outissue/airified/build.gradle b/outissue/airified/build.gradle index c8ba6f6..c28bb24 100644 --- a/outissue/airified/build.gradle +++ b/outissue/airified/build.gradle @@ -1,8 +1,5 @@ -apply plugin: 'com.android.library'; -apply plugin: 'com.jakewharton.butterknife' +apply plugin: 'com.android.library' dependencies { - annotationProcessor deps.apt.butterKnifeCompiler - compile deps.external.butterKnife annotationProcessor deps.other.recyclerview annotationProcessor deps.apt.daggerCompiler annotationProcessor project(':outissue:caricetum:handbolt') diff --git a/outissue/aricine/build.gradle b/outissue/aricine/build.gradle index 0b2c6ca..bdcff2c 100644 --- a/outissue/aricine/build.gradle +++ b/outissue/aricine/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile deps.support.annotations compile deps.other.googleMap diff --git a/outissue/bracciale/build.gradle b/outissue/bracciale/build.gradle index 730e93e..a6d769a 100644 --- a/outissue/bracciale/build.gradle +++ b/outissue/bracciale/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile project(':outissue:tetragram') compile project(':outissue:caricetum:midship') diff --git a/outissue/browntail/build.gradle b/outissue/browntail/build.gradle index de1af8f..aff2989 100644 --- a/outissue/browntail/build.gradle +++ b/outissue/browntail/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile project(':outissue:proctoral') diff --git a/outissue/caricetum/midship/build.gradle b/outissue/caricetum/midship/build.gradle index 2882e54..cddbf3e 100644 --- a/outissue/caricetum/midship/build.gradle +++ b/outissue/caricetum/midship/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile project(':outissue:caricetum:concher') compile project(':outissue:carnally') diff --git a/outissue/caricetum/scientist/build.gradle b/outissue/caricetum/scientist/build.gradle index f8b889b..6c743cb 100644 --- a/outissue/caricetum/scientist/build.gradle +++ b/outissue/caricetum/scientist/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { provided deps.support.annotations diff --git a/outissue/caricetum/skiapod/build.gradle b/outissue/caricetum/skiapod/build.gradle index 5de1d19..da6e27a 100644 --- a/outissue/caricetum/skiapod/build.gradle +++ b/outissue/caricetum/skiapod/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { provided deps.support.annotations diff --git a/outissue/carnally/build.gradle b/outissue/carnally/build.gradle index 67a6557..de16038 100644 --- a/outissue/carnally/build.gradle +++ b/outissue/carnally/build.gradle @@ -1,11 +1,8 @@ -apply plugin: 'com.android.library'; -apply plugin: 'com.jakewharton.butterknife' +apply plugin: 'com.android.library' dependencies { compile project(':outissue:aricine') compile project(':outissue:nursing') - annotationProcessor deps.apt.butterKnifeCompiler - compile deps.external.butterKnife compile deps.other.geo compile deps.support.appCompat compile deps.support.design diff --git a/outissue/caudate/build.gradle b/outissue/caudate/build.gradle index e6be304..cc713e0 100644 --- a/outissue/caudate/build.gradle +++ b/outissue/caudate/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor deps.apt.daggerCompiler @@ -12,7 +12,6 @@ dependencies { compile deps.support.annotations compile deps.external.dagger compile deps.external.timber - compile deps.other.butterknife compile deps.other.autoValueGson compile deps.other.gson diff --git a/outissue/coherence/build.gradle b/outissue/coherence/build.gradle index 6545779..c9cb7ee 100644 --- a/outissue/coherence/build.gradle +++ b/outissue/coherence/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile deps.other.geo compile deps.other.geo diff --git a/outissue/cyclus/build.gradle b/outissue/cyclus/build.gradle index c79575a..655cbd5 100644 --- a/outissue/cyclus/build.gradle +++ b/outissue/cyclus/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile deps.other.leanback compile deps.other.rebound diff --git a/outissue/defusion/build.gradle b/outissue/defusion/build.gradle index a3dcd38..941f5b8 100644 --- a/outissue/defusion/build.gradle +++ b/outissue/defusion/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile project(':outissue:ergamine') compile deps.external.rxandroid diff --git a/outissue/embrace/build.gradle b/outissue/embrace/build.gradle index 4678d0b..d6c3fbc 100644 --- a/outissue/embrace/build.gradle +++ b/outissue/embrace/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile deps.other.leanback diff --git a/outissue/extended/build.gradle b/outissue/extended/build.gradle index fbb771a..37add36 100644 --- a/outissue/extended/build.gradle +++ b/outissue/extended/build.gradle @@ -1,9 +1,8 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile project(':outissue:caricetum:midship') compile deps.other.geo - compile deps.other.butterknife compile project(':outissue:nutate') compile project(':outissue:browntail') diff --git a/outissue/eyesore/build.gradle b/outissue/eyesore/build.gradle index beb955a..e4c9c9e 100644 --- a/outissue/eyesore/build.gradle +++ b/outissue/eyesore/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor deps.apt.daggerCompiler diff --git a/outissue/gliadin/build.gradle b/outissue/gliadin/build.gradle index 5663c08..3c6eaa2 100644 --- a/outissue/gliadin/build.gradle +++ b/outissue/gliadin/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile deps.other.javautil compile deps.other.autovalue diff --git a/outissue/nonjurant/build.gradle b/outissue/nonjurant/build.gradle index 3e1f56e..023a141 100644 --- a/outissue/nonjurant/build.gradle +++ b/outissue/nonjurant/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile deps.support.annotations compile deps.external.deviceYearClass diff --git a/outissue/nonparty/build.gradle b/outissue/nonparty/build.gradle index 271c6dd..a0300d2 100644 --- a/outissue/nonparty/build.gradle +++ b/outissue/nonparty/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor deps.other.recyclerview annotationProcessor deps.apt.daggerCompiler diff --git a/outissue/nonunion/build.gradle b/outissue/nonunion/build.gradle index c890254..7061029 100644 --- a/outissue/nonunion/build.gradle +++ b/outissue/nonunion/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile project(':outissue:extended') compile project(':outissue:caricetum:midship') diff --git a/outissue/nursing/build.gradle b/outissue/nursing/build.gradle index 460d2c3..3edc866 100644 --- a/outissue/nursing/build.gradle +++ b/outissue/nursing/build.gradle @@ -1,18 +1,11 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { - // safe libraries as they are compile time checked. compile deps.support.annotations annotationProcessor deps.other.recyclerview compile deps.other.appcompat - // required for serializing json. compile deps.external.gson - - // used for getting device information. compile deps.other.googleMap - - // temporary include until we move all models from android-crash and remove application dependency to the - // old crash reporter. compile deps.other.rave testCompile project(':outissue:cyclus') diff --git a/outissue/nutate/build.gradle b/outissue/nutate/build.gradle index 0c140c4..2ce2976 100644 --- a/outissue/nutate/build.gradle +++ b/outissue/nutate/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile deps.external.kryo diff --git a/outissue/oleometer/build.gradle b/outissue/oleometer/build.gradle index 361c4d0..d04dc66 100644 --- a/outissue/oleometer/build.gradle +++ b/outissue/oleometer/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile deps.support.annotations testCompile deps.other.leanback diff --git a/outissue/phasmatid/build.gradle b/outissue/phasmatid/build.gradle index bc48688..cbb5220 100644 --- a/outissue/phasmatid/build.gradle +++ b/outissue/phasmatid/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile deps.support.annotations compile deps.support.design diff --git a/outissue/shortsome/build.gradle b/outissue/shortsome/build.gradle index 791f9cd..a6edfda 100644 --- a/outissue/shortsome/build.gradle +++ b/outissue/shortsome/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile deps.other.facebook compile deps.external.rxjava diff --git a/outissue/situla/build.gradle b/outissue/situla/build.gradle index 8a6b605..d2f3510 100644 --- a/outissue/situla/build.gradle +++ b/outissue/situla/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor deps.other.recyclerview compile deps.support.appCompat diff --git a/outissue/synarchy/build.gradle b/outissue/synarchy/build.gradle index 1abe3ef..299eef7 100644 --- a/outissue/synarchy/build.gradle +++ b/outissue/synarchy/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile deps.support.annotations compile deps.external.timber diff --git a/outissue/tetragram/build.gradle b/outissue/tetragram/build.gradle index ede6fb2..e8b4ef7 100644 --- a/outissue/tetragram/build.gradle +++ b/outissue/tetragram/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile deps.support.annotations diff --git a/outissue/worldway/build.gradle b/outissue/worldway/build.gradle index c69d607..e5c9fed 100644 --- a/outissue/worldway/build.gradle +++ b/outissue/worldway/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor deps.apt.daggerCompiler annotationProcessor project(':outissue:caricetum:handbolt') diff --git a/phthalic/build.gradle b/phthalic/build.gradle index fc7b1f8..289e526 100644 --- a/phthalic/build.gradle +++ b/phthalic/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.application'; +apply plugin: 'com.android.application' dependencies { debugCompile project(':Padraig:arbitrate') releaseCompile project(':Padraig:cuminoin') diff --git a/preprice/build.gradle b/preprice/build.gradle index 93aa54d..c2a513b 100644 --- a/preprice/build.gradle +++ b/preprice/build.gradle @@ -1,6 +1,5 @@ -apply plugin: 'com.android.application'; +apply plugin: 'com.android.application' dependencies { - annotationProcessor deps.apt.butterKnifeCompiler annotationProcessor deps.other.recyclerview annotationProcessor deps.apt.daggerCompiler annotationProcessor deps.other.appcompat @@ -13,7 +12,7 @@ dependencies { compile project(':outissue:stupendly') compile project(':outissue:caricetum:midship') compile project(':outissue:caricetum:skiapod') - compile project(':outissue:tristate'); + compile project(':outissue:tristate') compile project(':outissue:defusion') compile project(':outissue:carnally') @@ -29,10 +28,8 @@ dependencies { compile deps.other.geo compile deps.support.multidex compile deps.other.exo - compile deps.other.butterknife compile deps.other.mvp compile deps.other.utils - compile deps.other.bkCompiler compile deps.other.calligraphy compile deps.other.guava compile deps.other.picasso @@ -41,7 +38,6 @@ dependencies { compile deps.other.javax compile deps.other.javaxInject compile deps.other.javapoet - compile deps.other.bkCompiler compile deps.other.crittercism compile deps.other.location compile deps.other.locationServiceGoogle diff --git a/subvola/Brittany/build.gradle b/subvola/Brittany/build.gradle index 2fb1971..a9f69ea 100644 --- a/subvola/Brittany/build.gradle +++ b/subvola/Brittany/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile project(':outissue:tetragram') compile project(':outissue:extended') diff --git a/subvola/Dipnoi/build.gradle b/subvola/Dipnoi/build.gradle index b93b09a..3396e5e 100644 --- a/subvola/Dipnoi/build.gradle +++ b/subvola/Dipnoi/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor project(':outissue:caricetum:handbolt') annotationProcessor project(':outissue:caricetum:Chelura') diff --git a/subvola/Leporis/build.gradle b/subvola/Leporis/build.gradle index 5c18b94..d2dc526 100644 --- a/subvola/Leporis/build.gradle +++ b/subvola/Leporis/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor deps.apt.daggerCompiler annotationProcessor deps.other.recyclerview diff --git a/subvola/absconsa/build.gradle b/subvola/absconsa/build.gradle index 49effc7..6a639b1 100644 --- a/subvola/absconsa/build.gradle +++ b/subvola/absconsa/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { androidTestCompile deps.support.annotations androidTestCompile deps.other.recyclerview @@ -13,7 +13,6 @@ dependencies { compile deps.external.dagger compile deps.external.picasso compile deps.other.retrofit - compile deps.other.butterknife compile deps.other.javaxInject compile deps.other.appcompat compile deps.other.geo diff --git a/subvola/aluminize/build.gradle b/subvola/aluminize/build.gradle index cd1ade2..57e2451 100644 --- a/subvola/aluminize/build.gradle +++ b/subvola/aluminize/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor project(':outissue:caricetum:handbolt') annotationProcessor project(':outissue:caricetum:Chelura') diff --git a/subvola/atbash/build.gradle b/subvola/atbash/build.gradle index 38e4535..61e2b67 100644 --- a/subvola/atbash/build.gradle +++ b/subvola/atbash/build.gradle @@ -1,13 +1,10 @@ -apply plugin: 'com.android.library'; -apply plugin: 'com.jakewharton.butterknife' +apply plugin: 'com.android.library' dependencies { - annotationProcessor deps.apt.butterKnifeCompiler annotationProcessor deps.apt.daggerCompiler annotationProcessor project(':outissue:caricetum:handbolt') annotationProcessor project(':outissue:caricetum:Chelura') compile deps.apt.javaxInject - compile deps.external.butterKnife compile deps.external.dagger compile deps.support.annotations compile deps.other.appcompat diff --git a/subvola/cleithral/build.gradle b/subvola/cleithral/build.gradle index c485395..9d443a8 100644 --- a/subvola/cleithral/build.gradle +++ b/subvola/cleithral/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor project(':outissue:caricetum:handbolt') annotationProcessor project(':outissue:caricetum:Chelura') diff --git a/subvola/copsewood/build.gradle b/subvola/copsewood/build.gradle index ab79699..e5e742a 100644 --- a/subvola/copsewood/build.gradle +++ b/subvola/copsewood/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor deps.apt.daggerCompiler annotationProcessor deps.other.recyclerview diff --git a/subvola/doored/build.gradle b/subvola/doored/build.gradle index efbebbf..4e79451 100644 --- a/subvola/doored/build.gradle +++ b/subvola/doored/build.gradle @@ -1,9 +1,7 @@ -apply plugin: 'com.android.library'; -apply plugin: 'com.jakewharton.butterknife' +apply plugin: 'com.android.library' dependencies { annotationProcessor project(':outissue:caricetum:handbolt') annotationProcessor project(':outissue:caricetum:Chelura') - annotationProcessor deps.apt.butterKnifeCompiler annotationProcessor deps.apt.daggerCompiler annotationProcessor deps.other.recyclerview @@ -18,7 +16,6 @@ dependencies { compile project(':fratry:sodden') compile project(':fratry:subradius') compile project(':fratry:Krapina') - compile deps.external.butterKnife compile deps.external.dagger compile deps.support.design diff --git a/subvola/emergency/build.gradle b/subvola/emergency/build.gradle index 9175bee..a160953 100644 --- a/subvola/emergency/build.gradle +++ b/subvola/emergency/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor project(':outissue:caricetum:handbolt') annotationProcessor project(':outissue:caricetum:Chelura') diff --git a/subvola/gorgoneum/Chordata/build.gradle b/subvola/gorgoneum/Chordata/build.gradle index 6ef3683..ca149c0 100644 --- a/subvola/gorgoneum/Chordata/build.gradle +++ b/subvola/gorgoneum/Chordata/build.gradle @@ -1,9 +1,7 @@ -apply plugin: 'com.android.library'; -apply plugin: 'com.jakewharton.butterknife' +apply plugin: 'com.android.library' dependencies { annotationProcessor project(':outissue:caricetum:handbolt') annotationProcessor project(':outissue:caricetum:Chelura') - annotationProcessor deps.apt.butterKnifeCompiler annotationProcessor deps.other.recyclerview annotationProcessor deps.apt.daggerCompiler diff --git a/subvola/gorgoneum/metanilic/agaric/build.gradle b/subvola/gorgoneum/metanilic/agaric/build.gradle index c28ecf9..fdd5d02 100644 --- a/subvola/gorgoneum/metanilic/agaric/build.gradle +++ b/subvola/gorgoneum/metanilic/agaric/build.gradle @@ -1,9 +1,7 @@ -apply plugin: 'com.android.library'; -apply plugin: 'com.jakewharton.butterknife' +apply plugin: 'com.android.library' dependencies { annotationProcessor project(':outissue:caricetum:handbolt') annotationProcessor project(':outissue:caricetum:Chelura') - annotationProcessor deps.apt.butterKnifeCompiler annotationProcessor deps.apt.daggerCompiler compile project(':outissue:tetragram') diff --git a/subvola/gorgoneum/teerer/Cuphea/build.gradle b/subvola/gorgoneum/teerer/Cuphea/build.gradle index 0bd701b..2f79c9d 100644 --- a/subvola/gorgoneum/teerer/Cuphea/build.gradle +++ b/subvola/gorgoneum/teerer/Cuphea/build.gradle @@ -1,7 +1,5 @@ -apply plugin: 'com.android.library'; -apply plugin: 'com.jakewharton.butterknife' +apply plugin: 'com.android.library' dependencies { - annotationProcessor deps.apt.butterKnifeCompiler annotationProcessor deps.apt.daggerCompiler annotationProcessor deps.other.recyclerview annotationProcessor project(':outissue:caricetum:handbolt') diff --git a/subvola/gorgoneum/teerer/Onondaga/build.gradle b/subvola/gorgoneum/teerer/Onondaga/build.gradle index f53a842..84fef32 100644 --- a/subvola/gorgoneum/teerer/Onondaga/build.gradle +++ b/subvola/gorgoneum/teerer/Onondaga/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor project(':outissue:caricetum:handbolt') annotationProcessor project(':outissue:caricetum:Chelura') diff --git a/subvola/gorgoneum/teerer/lucrific/build.gradle b/subvola/gorgoneum/teerer/lucrific/build.gradle index 9bf1bc6..6128832 100644 --- a/subvola/gorgoneum/teerer/lucrific/build.gradle +++ b/subvola/gorgoneum/teerer/lucrific/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor deps.apt.daggerCompiler annotationProcessor deps.other.recyclerview diff --git a/subvola/gorgoneum/teerer/perscribe/build.gradle b/subvola/gorgoneum/teerer/perscribe/build.gradle index fbcb380..f833fd2 100644 --- a/subvola/gorgoneum/teerer/perscribe/build.gradle +++ b/subvola/gorgoneum/teerer/perscribe/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor project(':outissue:caricetum:handbolt') annotationProcessor project(':outissue:caricetum:Chelura') diff --git a/subvola/gorgoneum/teerer/polytonal/build.gradle b/subvola/gorgoneum/teerer/polytonal/build.gradle index 657e4e3..075bc96 100644 --- a/subvola/gorgoneum/teerer/polytonal/build.gradle +++ b/subvola/gorgoneum/teerer/polytonal/build.gradle @@ -1,7 +1,5 @@ -apply plugin: 'com.android.library'; -apply plugin: 'com.jakewharton.butterknife' +apply plugin: 'com.android.library' dependencies { - annotationProcessor deps.apt.butterKnifeCompiler annotationProcessor deps.apt.daggerCompiler annotationProcessor deps.other.recyclerview annotationProcessor project(':outissue:caricetum:handbolt') diff --git a/subvola/gorgoneum/teerer/revalenta/build.gradle b/subvola/gorgoneum/teerer/revalenta/build.gradle index 6ea9d57..c343612 100644 --- a/subvola/gorgoneum/teerer/revalenta/build.gradle +++ b/subvola/gorgoneum/teerer/revalenta/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor deps.apt.daggerCompiler annotationProcessor deps.other.recyclerview diff --git a/subvola/gorgoneum/unwincing/build.gradle b/subvola/gorgoneum/unwincing/build.gradle index fe1ba3d..f0735f6 100644 --- a/subvola/gorgoneum/unwincing/build.gradle +++ b/subvola/gorgoneum/unwincing/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor project(':outissue:caricetum:handbolt') annotationProcessor project(':outissue:caricetum:Chelura') diff --git a/subvola/graphite/build.gradle b/subvola/graphite/build.gradle index 14c10bb..8c8ba11 100644 --- a/subvola/graphite/build.gradle +++ b/subvola/graphite/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor project(':outissue:caricetum:handbolt') annotationProcessor project(':outissue:caricetum:Chelura') diff --git a/subvola/haploidic/build.gradle b/subvola/haploidic/build.gradle index cd1ade2..57e2451 100644 --- a/subvola/haploidic/build.gradle +++ b/subvola/haploidic/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor project(':outissue:caricetum:handbolt') annotationProcessor project(':outissue:caricetum:Chelura') diff --git a/subvola/inhumanly/build.gradle b/subvola/inhumanly/build.gradle index ba2e355..366399d 100644 --- a/subvola/inhumanly/build.gradle +++ b/subvola/inhumanly/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor project(':outissue:caricetum:handbolt') annotationProcessor project(':outissue:caricetum:Chelura') diff --git a/subvola/liming/build.gradle b/subvola/liming/build.gradle index db05960..4e79451 100644 --- a/subvola/liming/build.gradle +++ b/subvola/liming/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor project(':outissue:caricetum:handbolt') annotationProcessor project(':outissue:caricetum:Chelura') diff --git a/subvola/ocracy/build.gradle b/subvola/ocracy/build.gradle index 4866dc1..900b626 100644 --- a/subvola/ocracy/build.gradle +++ b/subvola/ocracy/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor deps.apt.daggerCompiler @@ -13,7 +13,6 @@ dependencies { compile project(':fratry:Ormond') compile project(':fratry:subradius') provided deps.other.roasterApi - compile deps.other.bkCompiler compile deps.other.geo compile deps.external.dagger compile deps.other.geo diff --git a/subvola/papistry/build.gradle b/subvola/papistry/build.gradle index b2ba850..71c8180 100644 --- a/subvola/papistry/build.gradle +++ b/subvola/papistry/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { compile project(':outissue:extended') compile project(':outissue:carnally') diff --git a/subvola/remigrate/build.gradle b/subvola/remigrate/build.gradle index fdb1199..299145f 100644 --- a/subvola/remigrate/build.gradle +++ b/subvola/remigrate/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor project(':outissue:caricetum:handbolt') annotationProcessor project(':outissue:caricetum:Chelura') diff --git a/subvola/suborder/build.gradle b/subvola/suborder/build.gradle index e261d80..5501f6c 100644 --- a/subvola/suborder/build.gradle +++ b/subvola/suborder/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor project(':outissue:caricetum:handbolt') annotationProcessor project(':outissue:caricetum:Chelura') diff --git a/subvola/tourer/build.gradle b/subvola/tourer/build.gradle index a4d56aa..65adb37 100644 --- a/subvola/tourer/build.gradle +++ b/subvola/tourer/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor project(':outissue:caricetum:handbolt') annotationProcessor project(':outissue:caricetum:Chelura') diff --git a/subvola/transpire/build.gradle b/subvola/transpire/build.gradle index 7722448..c62ce02 100644 --- a/subvola/transpire/build.gradle +++ b/subvola/transpire/build.gradle @@ -1,9 +1,7 @@ -apply plugin: 'com.android.library'; -apply plugin: 'com.jakewharton.butterknife' +apply plugin: 'com.android.library' dependencies { annotationProcessor project(':outissue:caricetum:handbolt') annotationProcessor project(':outissue:caricetum:Chelura') - annotationProcessor deps.apt.butterKnifeCompiler annotationProcessor deps.apt.daggerCompiler annotationProcessor deps.other.recyclerview @@ -19,7 +17,6 @@ dependencies { compile project(':fratry:savory') compile project(':fratry:halsen') compile deps.support.design - compile deps.external.butterKnife compile deps.other.exo testCompile deps.test.opentracing diff --git a/subvola/unmilked/build.gradle b/subvola/unmilked/build.gradle index 5778028..d697da9 100644 --- a/subvola/unmilked/build.gradle +++ b/subvola/unmilked/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor deps.apt.daggerCompiler diff --git a/subvola/wordsmith/build.gradle b/subvola/wordsmith/build.gradle index 5bf2e4b..19e43e0 100644 --- a/subvola/wordsmith/build.gradle +++ b/subvola/wordsmith/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor project(':outissue:caricetum:handbolt') annotationProcessor project(':outissue:caricetum:Chelura') diff --git a/subvola/zealotic/build.gradle b/subvola/zealotic/build.gradle index e4b04e1..15f3b24 100644 --- a/subvola/zealotic/build.gradle +++ b/subvola/zealotic/build.gradle @@ -1,4 +1,4 @@ -apply plugin: 'com.android.library'; +apply plugin: 'com.android.library' dependencies { annotationProcessor deps.apt.daggerCompiler annotationProcessor project(':outissue:caricetum:handbolt') diff --git a/subvola/zelator/build.gradle b/subvola/zelator/build.gradle index bea625d..a5dbf18 100644 --- a/subvola/zelator/build.gradle +++ b/subvola/zelator/build.gradle @@ -1,9 +1,7 @@ -apply plugin: 'com.android.library'; -apply plugin: 'com.jakewharton.butterknife' +apply plugin: 'com.android.library' dependencies { annotationProcessor project(':outissue:caricetum:handbolt') annotationProcessor project(':outissue:caricetum:Chelura') - annotationProcessor deps.apt.butterKnifeCompiler annotationProcessor deps.other.recyclerview annotationProcessor deps.apt.daggerCompiler @@ -15,7 +13,6 @@ dependencies { compile project(':outissue:Glumaceae') compile project(':outissue:carnally') compile project(':outissue:tetragram') - compile deps.external.butterKnife compile deps.external.dagger compile deps.support.design |