Add support for ADT 3.0 and ktlin tasks for multidimension projects #32

originx · 2017-10-26T06:54:54Z

Add support for Android build tools 3.0 and ktlin tasks for multidimension builds.

new google repo is added since this is now a maven repo where google
hosts all of its tools from now on.

related to:
#29

…nsion builds. new google repo is added since this is now a maven repo where google hosts all of its tools from now on.

leinardi

Don't always use LibraryPlugin to get the variantManager

leinardi · 2017-10-26T07:15:20Z

src/main/kotlin/org/jlleitschuh/gradle/ktlint/KtlintPlugin.kt

+                val variantManager = when {
+                    target.plugins.hasPlugin(AppPlugin::class.java) -> target.plugins.findPlugin(AppPlugin::class.java)?.variantManager
+                    target.plugins.hasPlugin(LibraryPlugin::class.java) -> target.plugins.findPlugin(LibraryPlugin::class.java)?.variantManager
+                    target.plugins.hasPlugin(InstantAppPlugin::class.java) -> target.plugins.findPlugin(LibraryPlugin::class.java)?.variantManager


Hi @originx, is it wanted to always use the LibraryPlugin? Probably it will be better to use the specific Plugin, in this case InstantAppPlugin.

yep thanks, rush of duplicating lines, fixed now :) thx

Tapchicoma · 2017-10-26T07:06:10Z

build.gradle.kts

 }

 dependencies {
    compileOnly(gradleApi())
    compileOnly(kotlin("gradle-plugin", "1.1.1"))
-    compileOnly("com.android.tools.build:gradle:2.3.3")
+    compileOnly("com.android.tools.build:gradle:3.0.0-rc2")


3.0.0 is already available, please update to it.

Tapchicoma · 2017-10-26T07:27:34Z

@originx can you also update CHANGELOG.md?

leinardi · 2017-10-26T07:28:33Z

@Tapchicoma what about kotlin version? Any reason why the project is using 1.1.1 instead of 1.1.51?

Tapchicoma · 2017-10-26T07:35:58Z

@leinardi I have the same question, can't answer it by now. But it is not the scope of this PR.

…nsion builds. new google repo is added since this is now a maven repo where google hosts all of its tools from now on.

originx · 2017-10-26T07:48:21Z

review comments done, please recheck,
@Tapchicoma
cheers :)

Tapchicoma · 2017-10-26T07:51:23Z

I want to test this changes later, when I will at home. Overall looks good.

JLLeitschuh · 2017-10-26T16:02:11Z

src/main/kotlin/org/jlleitschuh/gradle/ktlint/KtlintPlugin.kt

@@ -1,6 +1,6 @@
 package org.jlleitschuh.gradle.ktlint

-import com.android.build.gradle.BaseExtension
+import com.android.build.gradle.*


Don't use star imports please

Ktlint-gradle should run ktlint on itself 😄

Fixed in 7ddc8b0

Tapchicoma · 2017-10-26T18:10:54Z

Checked, works ok.

@JLLeitschuh this PR breaks support for older android plugin (2.3.3). I propose release current master with fix for newer ktlint versions and then make a new release with this PR.

JLLeitschuh · 2017-10-26T18:55:30Z

This fix is going to require a major version bump of the plugin because one of our dependencies has incremented its major version number.

JLLeitschuh · 2017-11-09T22:12:57Z

This now has merge conflicts (sorry). We may want to merge #36 first.

JLLeitschuh · 2017-11-09T22:33:05Z

I just made your merge conflicts much worse. Sorry.

Signed-off-by: Yahor Berdnikau <[email protected]>

JLLeitschuh · 2017-11-14T19:06:21Z

CHANGELOG.md

@@ -19,7 +20,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - Define a different output file for each sourceSet
 ### Fixed
- - Fixed plugin doesn't apply custom reporter for ktlint versions >0.10.x (#28)
+- Fixed plugin doesn't apply custom reporter for ktlint versions >0.10.x (#28)


Unnecessary whitespace change?

Oh, damn, will update

Check this commit d26f377

JLLeitschuh · 2017-11-14T19:08:09Z

plugin/src/main/kotlin/org/jlleitschuh/gradle/ktlint/KtlintPlugin.kt

+                    target.plugins.hasPlugin(InstantAppPlugin::class.java) -> target.plugins.findPlugin(InstantAppPlugin::class.java)?.variantManager
+                    target.plugins.hasPlugin(FeaturePlugin::class.java) -> target.plugins.findPlugin(FeaturePlugin::class.java)?.variantManager
+                    target.plugins.hasPlugin(TestPlugin::class.java) -> target.plugins.findPlugin(TestPlugin::class.java)?.variantManager
+                    else -> throw StopExecutionException("Must be applied with 'android' or 'android-library' plugin.")


Are all of these types guaranteed to be on the classpath when either the android or the android-library plugin is applied?

If only the android plugin is applied will you get a ClassDefNotFoundException for the AppPlugin class?

Yes, everything is ok. I've tested on my local test project.

Signed-off-by: Yahor Berdnikau <[email protected]>

JLLeitschuh

This looks good. Unless you want to add the android sample project too?

Tapchicoma · 2017-11-14T19:41:43Z

No, definetely I will add android project sample but in a separate PR.

originx added 2 commits October 26, 2017 08:40

Add support for Android build tools 3.0 and ktlin tasks for multidime…

b5cf65e

…nsion builds. new google repo is added since this is now a maven repo where google hosts all of its tools from now on.

Merge branch 'master' into master

f9f6ad4

leinardi suggested changes Oct 26, 2017

View reviewed changes

leinardi approved these changes Oct 26, 2017

View reviewed changes

Tapchicoma reviewed Oct 26, 2017

View reviewed changes

Add support for Android build tools 3.0 and ktlin tasks for multidime…

efb1879

…nsion builds. new google repo is added since this is now a maven repo where google hosts all of its tools from now on.

originx force-pushed the master branch from 31a4ef9 to efb1879 Compare October 26, 2017 07:38

originx mentioned this pull request Oct 26, 2017

Same output file for every task #33

Closed

JLLeitschuh reviewed Oct 26, 2017

View reviewed changes

Tapchicoma approved these changes Oct 26, 2017

View reviewed changes

Tapchicoma mentioned this pull request Nov 9, 2017

Add kotlin sample #36

Merged

Tapchicoma added 2 commits November 14, 2017 19:53

Merge branch 'master' into originx-master

d0eedb0

Fix wildcard import.

7ddc8b0

Signed-off-by: Yahor Berdnikau <[email protected]>

JLLeitschuh reviewed Nov 14, 2017

View reviewed changes

Tapchicoma force-pushed the master branch from d2c2263 to d26f377 Compare November 14, 2017 19:09

Fix failing checkstyle.

d26f377

Signed-off-by: Yahor Berdnikau <[email protected]>

JLLeitschuh approved these changes Nov 14, 2017

View reviewed changes

Tapchicoma merged commit 3b557e9 into JLLeitschuh:master Nov 14, 2017

Tapchicoma mentioned this pull request Nov 14, 2017

Multidimensional flavors are currently not working properly #29

Closed

JLLeitschuh mentioned this pull request Nov 27, 2017

Automatic Android support without specifying target "src/*/java/**/*.java" diffplug/spotless#111

Open

andrewparmet mentioned this pull request Oct 10, 2022

buf format does not discover Android source sets bufbuild/buf-gradle-plugin#80

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for ADT 3.0 and ktlin tasks for multidimension projects #32

Add support for ADT 3.0 and ktlin tasks for multidimension projects #32

originx commented Oct 26, 2017

leinardi left a comment

leinardi Oct 26, 2017 •

edited

Loading

originx Oct 26, 2017 •

edited

Loading

Tapchicoma Oct 26, 2017

originx Oct 26, 2017

Tapchicoma commented Oct 26, 2017

leinardi commented Oct 26, 2017

Tapchicoma commented Oct 26, 2017

originx commented Oct 26, 2017 •

edited

Loading

Tapchicoma commented Oct 26, 2017

JLLeitschuh Oct 26, 2017

Tapchicoma Oct 26, 2017

Tapchicoma Nov 14, 2017

Tapchicoma commented Oct 26, 2017

JLLeitschuh commented Oct 26, 2017

JLLeitschuh commented Nov 9, 2017

JLLeitschuh commented Nov 9, 2017

JLLeitschuh Nov 14, 2017

Tapchicoma Nov 14, 2017

Tapchicoma Nov 14, 2017

JLLeitschuh Nov 14, 2017

Tapchicoma Nov 14, 2017

JLLeitschuh left a comment

Tapchicoma commented Nov 14, 2017

Add support for ADT 3.0 and ktlin tasks for multidimension projects #32

Add support for ADT 3.0 and ktlin tasks for multidimension projects #32

Conversation

originx commented Oct 26, 2017

leinardi left a comment

Choose a reason for hiding this comment

leinardi Oct 26, 2017 • edited Loading

Choose a reason for hiding this comment

originx Oct 26, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Tapchicoma commented Oct 26, 2017

leinardi commented Oct 26, 2017

Tapchicoma commented Oct 26, 2017

originx commented Oct 26, 2017 • edited Loading

Tapchicoma commented Oct 26, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Tapchicoma commented Oct 26, 2017

JLLeitschuh commented Oct 26, 2017

JLLeitschuh commented Nov 9, 2017

JLLeitschuh commented Nov 9, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JLLeitschuh left a comment

Choose a reason for hiding this comment

Tapchicoma commented Nov 14, 2017

leinardi Oct 26, 2017 •

edited

Loading

originx Oct 26, 2017 •

edited

Loading

originx commented Oct 26, 2017 •

edited

Loading