#159 Renamed resources leading with "__" #161

ToxicBakery · 2015-05-29T14:02:00Z

Build tools "1.3.0 rc1" changed the rules for resources. This commit simply removes the lead "__" from the offending resources in the project.

…review build tools "1.3.0 rc1"

MGaetan89 · 2015-05-29T17:14:56Z

Maybe this PR could be the opportunity to use the Gradle resourcePrefix ?

ToxicBakery · 2015-05-29T18:47:19Z

Sure but that seems like another issue to me. I just needed a quick fix to get a working build for my projects.

ignaciogs · 2015-06-05T11:18:50Z

+1

JohNan · 2015-06-08T05:30:29Z

+1

bagintz · 2015-06-08T18:06:44Z

+1

shekibobo · 2015-06-09T01:46:51Z

@ToxicBakery Might also need to update the README.

seviu · 2015-06-12T09:04:41Z

+1

gonzalocasas · 2015-06-12T09:04:55Z

+1

tianshan20081 · 2015-06-12T09:42:48Z

+1

markiv · 2015-06-12T12:00:03Z

+1

langerhans · 2015-06-12T12:51:25Z

+1

AndreasBackx · 2015-06-12T14:37:50Z

+1

leelei · 2015-06-15T05:22:18Z

+1

drewhannay · 2015-06-15T16:19:35Z

+1

FrancisShi · 2015-06-16T07:20:40Z

+1

eccyan · 2015-06-16T08:20:59Z

+1

amusicegc · 2015-06-16T12:44:49Z

+1

artem-zinnatullin · 2015-06-16T18:45:56Z

Please stop this "+1" hell.
16 июня 2015 г. 3:44 PM пользователь "Austin Musice" <
notifications@github.com> написал:

+1

—
Reply to this email directly or view it on GitHub
#161 (comment).

bagintz · 2015-06-16T18:49:02Z

+1 to artem's comment

langerhans · 2015-06-16T19:29:22Z

+1 @artem-zinnatullin's comment. Someone should merge this to stop this madness.

TealOcean · 2015-06-19T06:47:38Z

+1

dianvaltodorov · 2015-06-20T15:00:39Z

+1

marcoRS · 2015-06-22T00:11:14Z

+1

linakis · 2015-06-22T11:46:17Z

+1

pizza · 2015-06-22T15:18:14Z

+1

ToxicBakery · 2015-06-23T12:42:12Z

Sigh...

jacobtabak · 2015-06-23T15:46:55Z

+1

ToxicBakery · 2015-07-01T11:48:21Z

That is a good question, I suggest doing what I did internally. Fork it and repackage it for now in your local repos with this patch applied.

dangalg · 2015-07-03T11:23:35Z

+18

MGaetan89 · 2015-07-05T11:07:27Z

It seems to be working again with version beta4 of the Gradle plugin

dangalg · 2015-07-05T11:09:44Z

Where can I find beta 4?

MGaetan89 · 2015-07-05T11:11:42Z

It's on jcenter.

You just need to change the version in your project build.gradle file.

IgorGanapolsky · 2015-07-05T15:06:06Z

But gradle beta4 doesn't work on Travis-ci. So this solution will
completely screw up automated builds for people!
On Jul 5, 2015 7:11 AM, "Gaëtan Muller" notifications@github.com wrote:

It's on jcenter
https://bintray.com/android/android-tools/com.android.tools.build.gradle/1.3.0-beta4/view
.

You just need to change the version in your project build.gradle file.

—
Reply to this email directly or view it on GitHub
#161 (comment).

MGaetan89 · 2015-07-05T15:24:00Z

I have no issue with the Gradle plugin version 1.3.0-beta4 on Travis.
What error do you have?

IgorGanapolsky · 2015-07-06T05:16:09Z

@MGaetan89 You are right, it works with that version. I confused the issue with buildToolsVersion '23.0.0 rc2' - which does NOT work on Travis-ci.

Thanks for the advise, have some @changetip bitcoin $1 on me.

MGaetan89 · 2015-07-06T06:08:49Z

No problem. Having a regular changelog for each Gradle plugin release would help more than guessing 😉

pyricau · 2015-07-14T18:05:31Z

Sorry guys I've been really busy for a while. Looking.

JakeWharton · 2015-07-14T18:08:32Z

-1

pyricau · 2015-07-14T18:10:06Z

Alright. Thank you for this PR, sorry for the wait. Seems like the full fix would be to remove the full manual prefix (__leak_canary_, not just __) for all resources, and then use Gradle resourcePrefix to set that to leak_canary.

ToxicBakery · 2015-07-14T18:18:01Z

Do you want me to update this PR or close it then? I can make that change if that is what you want from this.

pyricau · 2015-07-14T18:21:58Z

Yes, if you do the change I'll merge, thanks.

ToxicBakery · 2015-07-15T17:36:14Z

@pyricau actually have the time to look at this today and reading up I just want to make it clear that resourcePrefix is a lint utility and not a rename utility. Using a prefix of 'leak_canary_' lint will fail the build for resources that do not use that prefix inside the library. This seems like the correct and desired effect but it does mean the my original change will remain and more resources will now need to be renamed.

For reference:
http://tools.android.com/tech-docs/new-build-system
0.10.0

Resource Prefix support.
- Starting with Studio 0.5.8 Lint will warn you or resources not using the prefix.

Pretty sure they meant 'warn you of resources' not 'or'

…review build tools "1.3.0 rc1" - Added resourcePrefix lint check to validate all resource names are correct.

pyricau · 2015-07-19T23:27:31Z

Yep, I talked to Tor and he mentioned that.

pyricau · 2015-07-19T23:28:15Z

leakcanary-android/src/main/res/values-v14/leak_canary_themes.xml

@@ -15,6 +15,6 @@
  ~ limitations under the License.
  -->
 <resources>
-  <style name="__LeakCanary.Base" parent="android:Theme">
+  <style name="leak_canary_LeakCanary.Base" parent="android:Theme.Holo">


Why did this change?

ah, git is being bad at diffing.

pyricau · 2015-07-19T23:29:15Z

Alright, LGTM. We also need to update the changelog.

#159 Renamed resources leading with "__"

pyricau · 2015-07-19T23:30:29Z

Actually, @ToxicBakery, can you sign the CLA here: https://docs.google.com/a/squareup.com/forms/d/13WR8m5uZ2nAkJH41k7GdVBXAAbzDk00vxtEYjd6Imzg/viewform?ndplr=1&formkey=dDViT2xzUHAwRkI3X3k5Z0lQM091OGc6MQ

Otherwise I'll have to revert that PR.

ToxicBakery · 2015-07-20T01:53:21Z

Yeah np, signed.

pyricau · 2015-07-20T02:41:23Z

Thanks!

catupablo · 2015-07-24T16:09:26Z

Hi, could you give me an estimated release date for the 1.4 version? Thanks :)

pyricau · 2015-08-01T14:27:55Z

Sometimes in Q3, maybe.

square#159 Renamed resources leading with "__"

#159 Renamed resources leading with "__" to resolve build errors in p…

7b16af4

…review build tools "1.3.0 rc1"

MGaetan89 mentioned this pull request May 30, 2015

Compilation failed: Error: File-based resource names must start with a lowercase letter #165

Closed

Jween mentioned this pull request Jun 9, 2015

resource name causes a gradle build error when using 1.3.0-beta1 #159

Closed

#159 Renamed resources leading with "__" to resolve build errors in p…

87aec26

…review build tools "1.3.0 rc1" - Added resourcePrefix lint check to validate all resource names are correct.

pyricau reviewed Jul 19, 2015
View reviewed changes

pyricau added a commit that referenced this pull request Jul 19, 2015

Merge pull request #161 from ToxicBakery/master

5726f6a

#159 Renamed resources leading with "__"

pyricau merged commit 5726f6a into square:master Jul 19, 2015

pyricau added a commit that referenced this pull request Jul 19, 2015

Update changelog for #161

7bf2e74

Yky pushed a commit to Yky/leakcanary that referenced this pull request Feb 21, 2016

Merge pull request square#161 from ToxicBakery/master

2fdda79

square#159 Renamed resources leading with "__"

Yky pushed a commit to Yky/leakcanary that referenced this pull request Feb 21, 2016

Update changelog for square#161

946372a

Pengchengxiang pushed a commit to XLibrarys/leakcanary that referenced this pull request Jan 2, 2017

Merge pull request square#161 from ToxicBakery/master

12584c2

square#159 Renamed resources leading with "__"

#159 Renamed resources leading with "__" #161

#159 Renamed resources leading with "__" #161

Conversation

ToxicBakery commented May 29, 2015

MGaetan89 commented May 29, 2015

ToxicBakery commented May 29, 2015

ignaciogs commented Jun 5, 2015

JohNan commented Jun 8, 2015

bagintz commented Jun 8, 2015

shekibobo commented Jun 9, 2015

seviu commented Jun 12, 2015

gonzalocasas commented Jun 12, 2015

tianshan20081 commented Jun 12, 2015

markiv commented Jun 12, 2015

langerhans commented Jun 12, 2015

AndreasBackx commented Jun 12, 2015

leelei commented Jun 15, 2015

drewhannay commented Jun 15, 2015

FrancisShi commented Jun 16, 2015

eccyan commented Jun 16, 2015

amusicegc commented Jun 16, 2015

artem-zinnatullin commented Jun 16, 2015

bagintz commented Jun 16, 2015

langerhans commented Jun 16, 2015

TealOcean commented Jun 19, 2015

dianvaltodorov commented Jun 20, 2015

marcoRS commented Jun 22, 2015

linakis commented Jun 22, 2015

pizza commented Jun 22, 2015

ToxicBakery commented Jun 23, 2015

jacobtabak commented Jun 23, 2015

ToxicBakery commented Jul 1, 2015

dangalg commented Jul 3, 2015

MGaetan89 commented Jul 5, 2015

dangalg commented Jul 5, 2015

MGaetan89 commented Jul 5, 2015

IgorGanapolsky commented Jul 5, 2015

MGaetan89 commented Jul 5, 2015

IgorGanapolsky commented Jul 6, 2015

MGaetan89 commented Jul 6, 2015

pyricau commented Jul 14, 2015

JakeWharton commented Jul 14, 2015

pyricau commented Jul 14, 2015

ToxicBakery commented Jul 14, 2015

pyricau commented Jul 14, 2015

ToxicBakery commented Jul 15, 2015

pyricau commented Jul 19, 2015

pyricau Jul 19, 2015

Choose a reason for hiding this comment

pyricau Jul 19, 2015

Choose a reason for hiding this comment

pyricau commented Jul 19, 2015

pyricau commented Jul 19, 2015

ToxicBakery commented Jul 20, 2015

pyricau commented Jul 20, 2015

catupablo commented Jul 24, 2015

pyricau commented Aug 1, 2015