Граф коммитов

35 Коммитов

Автор SHA1 Сообщение Дата
Michael Comella d0a151fdf5 Bug 1258769 - Add checkstyle gradle task. r=nalexander
Run checkstyle via:
 ./mach gradle app:checkstyle

This is intended to be added to automation in bug 1258787 and made more robust
in bug 1261486.

For the addition of future checks, it's worth noting Google's config is
available:
  3e4367941c/src/main/resources/google_checks.xml

And this version contains links with descriptions of each of the tasks:
  http://checkstyle.sourceforge.net/google_style.html

MozReview-Commit-ID: 5HvtQsyY2JQ

--HG--
extra : rebase_source : ea45bcfb88ec302e9f6e6526d9afdbf2c9c93f01
2016-04-01 14:20:45 -07:00
Geoff Brown 5468e259d5 Bug 1181020 - Update to robotium 5.5.4; r=mcomella 2016-03-29 13:12:57 -06:00
Carsten "Tomcat" Book 1ca6cd33b5 Backed out changeset e93f8207a0b8 (bug 1181020) for breaking android on a CLOSED TREE 2016-03-29 15:57:27 +02:00
Geoff Brown 84aae03963 Bug 1181020 - Update to robotium 5.5.4; r=mcomella 2016-03-29 07:33:35 -06:00
Sebastian Kaspari d145b545ef Bug 1241810 - Introduce SimpleFeedParser for implementing "content notifications". r=mcomella
This is just a simple XML Pull Parser that can read arbitrary ATOM and RSS feeds and returns an
object describing the feed and the latest entry. It's goal is to be small and simple rather than
a full-featured feed parser library.

MozReview-Commit-ID: LIa9neYSfCF

--HG--
rename : mobile/android/app/src/main/resources/robolectric.properties => mobile/android/tests/background/junit4/resources/robolectric.properties
extra : rebase_source : 121fe20ce889092c00fc00ea43e69262724c1290
2016-02-24 10:55:35 -08:00
Nick Alexander 7f09195b24 Bug 1255926 - Exclude GCM and Push test files from Gradle configuration when !MOZ_ANDROID_GCM. r=bustage
MozReview-Commit-ID: GsYEyF7PTbS
2016-03-12 16:56:47 -08:00
Nick Alexander 2b40aea31a Bug 1255926 - Exclude GCM and Push files from Gradle configuration when !MOZ_ANDROID_GCM. r=bustage
MozReview-Commit-ID: Cs2dOZy0UUb

--HG--
extra : rebase_source : c9f5c82c4fe94dfe8bbaf6c700984c2c21f5716c
2016-03-12 16:16:01 -08:00
Nick Alexander dedaa7d47c Bug 1252928 - Part 1: Use Jake Wharton's sdk-manager-plugin in Fennec's Gradle configuration. r=sebastian
This is a version produced locally from
1d07987217.
I used |./gradlew install| and then copied the pieces out of ~/.m2/repository.

Local builders should never download using this plugin, since |mach configure|
ensures that all the relevant pieces can already be found.  It's just useful in
automation; and as an eventual replacement for chunks of |mach bootstrap|.

MozReview-Commit-ID: 9JiFe0xLr99

--HG--
extra : rebase_source : 5bbe5ada7fce0d3e8a702a09da7ff70fd639dc67
extra : histedit_source : aa7049abefafd652b0db2bd03ab15310967e0ad0
2016-03-01 20:12:04 -08:00
Michael Comella cb4b5898fc Bug 1238788 - Burn the tree on android lint failure. r=nalexander
Looking at [1], we halt_on_failure for the `postflight_build_mach_command`s and
the flag I flipped causes the lint command to return a non-zero exit code (i.e.
noting failure).

[1]: https://hg.mozilla.org/mozilla-central/rev/b7f1dac8306f#l2.29

MozReview-Commit-ID: 8v4am9zxxCk

--HG--
extra : rebase_source : 27236e557629ada3931b05d68fad3405cfcc0b5a
2016-03-02 12:00:29 -08:00
Nick Alexander 39c66402fe Bug 1249166 - Pre: Set JAVA_HOME in |mach gradle|. r=me
MozReview-Commit-ID: 4qQz5ZZJqik

--HG--
extra : rebase_source : fb3e729e710f7fc9615cc194ca4a8fb7ee0d72cf
2016-02-18 09:06:39 -08:00
Nick Alexander f0490cabd5 Bug 1074258 - Expand entities at build time when copying strings.xml in Gradle. r=me
DONTBUILD NPOTB

Android Studio (and IntelliJ) does not correctly handle &entity;
definitions in Android strings.xml files.  Strings with entities (in
Fennec, all of them) are rendered in the IDE as blank.  This patch
expands the entities when copying for use by Gradle, improving the IDE
integration.

MozReview-Commit-ID: 2T6CzoKc7v8

--HG--
extra : rebase_source : 75b2c9e20392d03b8077d2c313538c5fccc9cb34
extra : amend_source : 5b409cc858e08e5be2eef2ded1bc907f2d088e2d
extra : histedit_source : f702d4eb831af75f6374718efaffcf95f974731c
2016-02-17 17:16:51 -08:00
Nick Alexander 33a2ba2cc1 Bug 1233882 - Post: Make Gradle app manifest package be org.mozilla.gecko. r=me
MozReview-Commit-ID: 7YP0mShKc0S

--HG--
extra : rebase_source : 992ea0b6d2b3a52beec903fdf6309507d7df713b
extra : histedit_source : 719d54ff32f1d96537d8e9780e27ca3c7b8d97ba
2016-02-17 16:18:13 -08:00
Nick Alexander c4c73eceaa Bug 1233882 - Fold base Gradle project into app Gradle project. r=sebastian,mcomella
DONTBUILD NPOTB

Using the real Android manifest tripped up Robolectric, so I've taken
the easy way out and added a dummy TestGeckoApplication; see comment
in the code.

MozReview-Commit-ID: 4fCY504UgPu

--HG--
rename : mobile/android/app/base/lint.xml => mobile/android/app/lint.xml
rename : mobile/android/tests/background/junit4/resources/robolectric.properties => mobile/android/app/src/main/resources/robolectric.properties
extra : rebase_source : 689e879dd4ec4402d5e7f948fa5f8be256284a88
extra : intermediate-source : 746468f5d9798ff404a80cd957664e2b69a0e97c
extra : source : a7f63b3721cd3ba105990bbb37a87044383d26d9
extra : histedit_source : 6bdcfa36ddb45bbfd518c5459e4940e29a30f1c2%2C4bfef3b752a85174f1aa1f2226a286ac30bae25a
2016-02-17 19:25:54 -08:00
Nick Alexander c387030feb Backed out changeset 746468f5d979 (bug 1233882).
--HG--
extra : commitid : HtySXbh21EG
extra : rebase_source : 380db13c459c88d21b7f14d0d6830e7ab1094cc1
2016-02-05 21:19:13 -08:00
Nick Alexander dfb9b5b160 Bug 1234629 - Post: Add Gradle support for bouncer. r=me
--HG--
extra : commitid : 6jL7OTORPHp
extra : rebase_source : 19cc23344c425082888863cf7dbd00049ab1e3a1
extra : source : 54a3d0851bc60d26fb4744c605787031070052c8
extra : histedit_source : 842b7f6fafd9ee4ba00805b83d088cd9bf97e5cf
2016-01-26 11:54:00 -08:00
Nick Alexander 2f5eb6ac5e Bug 1233882 - Fold base Gradle project into app Gradle project. r=sebastian,mcomella
DONTBUILD NPOTB

Using the real Android manifest tripped up Robolectric, so I've taken
the easy way out and added a dummy TestGeckoApplication; see comment
in the code.

--HG--
rename : mobile/android/app/base/lint.xml => mobile/android/app/lint.xml
rename : mobile/android/tests/background/junit4/resources/robolectric.properties => mobile/android/app/src/main/resources/robolectric.properties
extra : commitid : 2aEbQRv0D7m
extra : rebase_source : c0f014e3fba7008967f8f9782125f940fcc89fe6
extra : amend_source : 46bfdfb116c026da490750a23a9c9188ab4cdf9a
extra : source : a7f63b3721cd3ba105990bbb37a87044383d26d9
2016-01-17 21:52:46 -08:00
Nigel Babu ede1aa8b36 Backed out 10 changesets (bug 1234629, bug 1233882) for bustage on Android rc tests
Backed out changeset 9aa32d9a25df (bug 1234629)
Backed out changeset d73d36c9619b (bug 1234629)
Backed out changeset a7f63b3721cd (bug 1233882)
Backed out changeset c79f4a8c3e86 (bug 1234629)
Backed out changeset 400c030d3c01 (bug 1234629)
Backed out changeset 54a3d0851bc6 (bug 1234629)
Backed out changeset f80912ecfa87 (bug 1234629)
Backed out changeset 50bcadca2131 (bug 1234629)
Backed out changeset aaa420ed66d7 (bug 1234629)
Backed out changeset 7a62e97f07c2 (bug 1234629)

--HG--
rename : mobile/android/app/lint.xml => mobile/android/app/base/lint.xml
rename : mobile/android/app/src/main/resources/robolectric.properties => mobile/android/tests/background/junit4/resources/robolectric.properties
extra : commitid : KJVIqyGBEZg
2016-02-05 15:42:28 +05:30
Nick Alexander 1288f37eaf Bug 1233882 - Fold base Gradle project into app Gradle project. r=sebastian,mcomella
DONTBUILD NPOTB

Using the real Android manifest tripped up Robolectric, so I've taken
the easy way out and added a dummy TestGeckoApplication; see comment
in the code.

--HG--
rename : mobile/android/app/base/lint.xml => mobile/android/app/lint.xml
rename : mobile/android/tests/background/junit4/resources/robolectric.properties => mobile/android/app/src/main/resources/robolectric.properties
extra : commitid : BSiXkLh5kSh
extra : rebase_source : ee178b04cd727e11a65f0550d88f1cd951cc5b7a
extra : amend_source : 45f49104a4687cf4cb71391c3f3ac2def8ef716a
2016-01-17 21:52:46 -08:00
Nick Alexander 242ce6bb3e Bug 1234629 - Post: Add Gradle support for bouncer. r=me
--HG--
extra : commitid : 6jL7OTORPHp
extra : rebase_source : 8151fcd1768b7bfd0a4386dd68c8910894cae892
extra : histedit_source : 673771296f66c8ec5885fef25999e5e195a1767e
2016-01-26 11:54:00 -08:00
Nick Alexander 3884e76c7e Bug 1163082 - Part 1: Add --with-android-distribution-directory. r=gps
This simply packs the assets/ subdirectory of the distribution
directory into the assets/ directory of the Android APK using existing
mechanisms.  It also removes the older method of manually pushing
files into dist/bin/distribution, from where they would be packaged
into the APK under distribution/.

--HG--
extra : commitid : BLgM6ZCm9AY
extra : rebase_source : a0896616f79f5a961476e4d2df9745516c58b44a
extra : source : e228040a044b7ff7363a178da2cb0b8b42724048
extra : histedit_source : 0b8f087bc6d70fa42401f4a2476898139bdf606c
2016-01-27 12:25:04 -08:00
Nick Alexander b266bd6df2 Backed out 2 changesets (bug 1163082) for Robocop rc1 failures.
Backed out changeset baf25be8d491 (bug 1163082)
Backed out changeset e228040a044b (bug 1163082)

--HG--
extra : commitid : FNz3fg58MOy
extra : amend_source : e24ac7d8fd3911a7e12ca71d8bb7e618aa1e78ac
2016-02-03 23:15:00 -08:00
Nick Alexander 609e5edb32 Bug 1163082 - Part 1: Add --with-android-distribution-directory. r=gps
This simply packs the assets/ subdirectory of the distribution
directory into the assets/ directory of the Android APK using existing
mechanisms.  It also removes the older method of manually pushing
files into dist/bin/distribution, from where they would be packaged
into the APK under distribution/.

--HG--
extra : commitid : BLgM6ZCm9AY
extra : rebase_source : 572d1ff35a02505f452fee67130b48c8df4499b5
extra : histedit_source : 0b8f087bc6d70fa42401f4a2476898139bdf606c
2016-01-27 12:25:04 -08:00
Nick Alexander 181807a4de Bug 1242797 - Use localOld product flavor for Spoon instrumentation tests. r=vivek
--HG--
extra : rebase_source : 1858d03e2ee50420b52f6ed345c8af5e0833fff1
2016-01-25 16:20:11 -08:00
Nick Alexander afb2d8e9c1 Bug 1242284 - Post: Use Gradle's manifest placeholders to produce Robocop manifest. r=sebastian
DONTBUILD NPOTB

This is a convenience, and a look ahead to a Gradle-based future.  The
reason to do this is that front-end builds don't (really) support
testing, so we set --disable-tests.  However, this means that
mobile/android/tests/browser/robocop doesn't get processed at build
time, and that means the Robocop manifest doesn't get preprocessed.
Rather than hack generating the Robocop manifest in, let's skate to
where the puck is going and just use Gradle where appropriate.

--HG--
extra : commitid : 5nV4JtPFbAL
extra : rebase_source : 80bc4b3e316ba9bbac568145594ad90c61758d9e
2016-01-11 18:02:34 -08:00
Nick Alexander 5a2b6e02cf Bug 1242284 - Add local, localOld, and automation Gradle product flavors. r=sebastian
The default configuration is now localDebug for API 21+, and
localOldDebug for <API 21.  This actually paves the way nicely for
automation builds; previously, I was intending to use debug and
release to for local and automation builds, respectively, but this is
more clear.

--HG--
extra : commitid : 9oZw1JaejG7
extra : rebase_source : 9793dbabbc7cd9ff63ba8c957e5ac200f6bd0d38
2015-12-16 16:48:22 -08:00
Sebastian Kaspari d7d2e5a08c Bug 1207194 - Set targetSdkVersion to 23. r=nalexander
--HG--
extra : commitid : 611GlASpgvx
extra : rebase_source : 188665feaf2bec8532e48a8da87ab0004e0e6b01
2016-01-11 11:58:14 +01:00
Richard Newman f73acc178f Bug 1237342 - Drop support for Android API 14 from Firefox builds. r=nalexander
--HG--
extra : commitid : Exc5s17e8Wt
extra : rebase_source : 0745780e85e84e5fa4263677582991053dcc49d1
2016-01-06 10:43:46 -08:00
Richard Newman b15bbcf116 Bug 1155801 - Part 3: bump all build.gradle files to minSdkVersion 14.
--HG--
extra : commitid : 35HJuBtTN4H
extra : source : 995c8eadd377d0a2538cb4260f88534b8f3e03c1
2015-12-30 18:59:17 -08:00
Nigel Babu 859b2bfb24 Backed out changeset 995c8eadd377 (bug 1155801)
--HG--
extra : commitid : BPcLQ85nUoJ
2015-12-31 13:57:28 +05:30
Richard Newman 08eedc4990 Bug 1155801 - Part 3: bump all build.gradle files to minSdkVersion 14.
--HG--
extra : commitid : Jhp7tIcq5NV
2015-12-30 18:59:17 -08:00
Nick Alexander e6a9770f2a Bug 938994 - Post: Update Gradle configurations. r=sebastian
I moved the JAR out of the root directory because I didn't want
multiple copies of things in robocop/ appearing in IntelliJ, although
this turns out to not be strictly necessary.  Keeping it as part of a
general push to move things out of the root dumping ground.

--HG--
rename : mobile/android/tests/browser/robocop/robotium-solo-4.3.1.jar => mobile/android/tests/browser/robocop/libs/robotium-solo-4.3.1.jar
extra : commitid : 6NYW1zNU7k8
extra : rebase_source : e152435da39612fdb69749936c713313f2a5b006
extra : histedit_source : aca11a9101156670d49fe89a9237031e4089f2b8
2015-11-09 10:18:45 -08:00
Nick Alexander 63896e74a9 Bug 1219846 - Part 2: Make 'omnijar' project in srcdir. r=me
DONTBUILD NPOTB

The :omnijar project is for IntelliJ only; adding it neatly labels
folders we consider part of the omnijar in mobile/android.  The JAR
produced is not used.

We add an evaluation-time dependency from :app to :omnijar so that we
can declare the set of omnijar folders exactly once.  We'd prefer to
have the dependency in the other direction (to save evaluation time)
but there's an interface mismatch between the two Gradle model types.
See comments in the :omnijar project.

This is delicate.

--HG--
extra : commitid : 4TLicjMC7Bn
extra : rebase_source : 5dd4ab1e1fcdb296b46bc892b9e10414baadee61
2015-10-29 11:11:36 -07:00
Nick Alexander f76697e53c Bug 1219846 - Part 1: Add 'app' Gradle project in srcdir. r=me
DONTBUILD NPOTB

--HG--
rename : mobile/android/gradle/app/build.gradle => mobile/android/app/build.gradle
extra : commitid : LPlhL4qUWDC
extra : rebase_source : 335d1b0e7f3dadfffd0c96634d96723cb3a0b583
2015-10-28 16:01:23 -07:00
Nick Alexander 4f3f4284e1 Bug 1098239 - Rewrite mobile/android Gradle integration. r=me
This is a big patch, but it's essentially NPOTB.  The part that is POTB
is ... removing Gradle integration from the build.  I've implemented
|mach gradle-install| as a substitute for the build system stuff; it's
just so much easier to iterate on a mach command than a moz.build and
Makefile.in.

I'm landing this with self-review because this lessens the impact of the
Gradle integration on the build system and because I am the only person
who understands either the old or the new system.

You'll need to run |mach gradle-install| at top level to configure the
new Gradle integration.  But |mach gradle ...| does the right thing
configuration steps too.

This patch rewrites most of the Gradle integration.  The major changes
are:

* all .gradle files move into mobile/android/gradle;
* all the Gradle projects live in the object directory;
* mozconfig exposed to all build.gradle files;
* simplification of Android configuration between build.gradle files;
* support for user-specified version of build tools;
* first steps towards supporting builds from the source directory;
* bumps Gradle to 2.2.1;
* bumps the Android-Gradle plugin to 0.14.4.

This is seemingly a step backwards given that we'd prefer to ship the
.idea directory in the source directory.  But in fact we get closer to
that; it's possible to run ./gradlew in the source directory and get a
reasonable build.  We'll progress with this in time.  The win right now
is that the projects are nested, which makes importing work better on
Linux machines.

Unfortunately IntelliJ 13 and 14 now have conflicting Android-Gradle
plugin version requirements, so we now only support IntelliJ 14.0.2 and
above.

--HG--
rename : mobile/android/base/gradle_AndroidManifest.xml => mobile/android/gradle/base/AndroidManifest.xml
rename : mobile/android/base/gradle_AndroidManifest.xml => mobile/android/gradle/branding/AndroidManifest.xml
rename : mobile/android/gradle/omnijar/gradle_AndroidManifest.xml => mobile/android/gradle/omnijar/AndroidManifest.xml
rename : mobile/android/base/gradle_AndroidManifest.xml => mobile/android/gradle/preprocessed_code/AndroidManifest.xml
rename : mobile/android/base/gradle_AndroidManifest.xml => mobile/android/gradle/preprocessed_resources/AndroidManifest.xml
rename : mobile/android/thirdparty/gradle_AndroidManifest.xml => mobile/android/gradle/thirdparty/AndroidManifest.xml
2014-12-22 19:49:04 -08:00
Nick Alexander 75e27bd0f3 Bug 1041395 - Add gradle configuration. r=gps
--HG--
rename : mobile/android/base/docs/index.rst => mobile/android/base/docs/uitelemetry.rst
2014-11-10 13:47:30 -08:00