Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to gradle v2.2.2 #4678

Merged
merged 2 commits into from
Oct 24, 2016
Merged

Update to gradle v2.2.2 #4678

merged 2 commits into from
Oct 24, 2016

Conversation

nbradbury
Copy link
Contributor

Updates gradle to v2.2.2 for Android Studio 2.2.2, which was released on October 19.

@maxme
Copy link
Contributor

maxme commented Oct 23, 2016

@nbradbury there are 3 other files to update:

libs/analytics/WordPressAnalytics/build.gradle:6:        classpath 'com.android.tools.build:gradle:2.2.1'
libs/editor/WordPressEditor/build.gradle:6:        classpath 'com.android.tools.build:gradle:2.2.1'
libs/networking/WordPressNetworking/build.gradle:6:        classpath 'com.android.tools.build:gradle:2.2.1'

@maxme maxme self-assigned this Oct 23, 2016
@nbradbury
Copy link
Contributor Author

@maxme I'm not sure why, but when I change those three build.gradle files, AS isn't recognizing them as being changed so they're not added to the commit. Any ideas?

@maxme
Copy link
Contributor

maxme commented Oct 24, 2016

Updated missing files in 5614c29
:shipit:

@maxme maxme merged commit ed85a73 into develop Oct 24, 2016
@maxme maxme deleted the issue/update-gradle-2.2.2 branch October 24, 2016 13:15
maxme added a commit that referenced this pull request Feb 7, 2017
5503849 Merge pull request #4627 from andrew659/develop
6fcfadb use SqlUtils.closeCursor() to close db cursors
f3200df Move common code into methods.
da0bda0 Remove extra whitespace.
4391682 Print additional info in the log stream when `android_models.properties` is missing or in the wrong form. Also added a reference to the current version used in wp-android.
023ee88 Do not hardcode "WordPress Android" in the header of the log.
8c0fe91 Merge pull request #4678 from wordpress-mobile/issue/update-gradle-2.2.2
18bb900 Merge pull request #4672 from wordpress-mobile/feature/reader-full-post-refresh-master
afe1389 Updated to gradle v2.2.2
b105bf5 Add a few safety checks to prevent NRE + refactoring
c8d6850 Replace Vectors with ArrayLists
4419c47 Add "ago" to timespan
3f16cda Update to Android Gradle Plugin 2.2.1
a528b64 Close the database cursor in MediaUtils
8e436bd Updating support library to 24.2.1
2340438 Updating gradle version to 2.2 for Android Studio 2.2
1cdfc80 Merge branch 'release/5.8' into release/5.9
85b4304 Merge commit '63de2e5270d210cbb5c24d02f4727302c806b20c' into issue/update-to-wputils-1.14
cf6f240 Merge commit 'a2e3dcec42f1bfa020de253008d3a13966437742' into develop
5030939 Merge commit '220cac4d1bc9ce6397d7d68f6d493bd307622cac' into issue/fix-imagesettings-alignment-issue
220cac4 Squashed 'libs/editor/' changes from 7932116..087a5b2
83de3e8 update travis config and bump build tools to 24.0.2
97f8f70 Merge commit '8730fb59ec9d075e9d009c56d0c7465a96daaf33' into release/5.8
8730fb5 Squashed 'libs/editor/' changes from eb069ba..7932116
f9b60fb Update com.android.tools.build:gradle to 2.1.3
90b8345 Updating the support library for all projects
2e0cb0d Targetting version 24
5f3e079 Updating to build tools 24.0.1
b760474 Modified `getRoundedEdgeBitmap()` to allow for no border
a6eb47a Merge branch 'release/5.6' into develop
8c64473 Squashed 'libs/editor/' changes from 7dcc1a9..eb069ba
78d2840 Merge commit '8c64473541f2199f74480f309d2821c8018c79a1' into sync-editor-1.3
9712927 Merge branch 'release/5.6' into develop
247e944 Merge branch 'hotfix/5.5.1' into release/5.6
e9d10d4 Updated legacy editor to place captions the same way as the web editor and visual editor (before the [/caption] closing tag)
afb0de7 Squashed 'libs/editor/' changes from 260a0d5..7dcc1a9
5d688bd Merge commit 'afb0de7a32b95bd121066088dc795f8a6e98909c' into hotfix/5.5.1
3278019 Remove URL fragment when photon-izing an image URL
ced2637 Squashed 'libs/editor/' changes from a92ad9d..260a0d5
76db6ed Merge commit 'ced263752a32fb381556cee59b6a2031f5b4f380' into hotfix/5.5.1
71bd8cf Merge branch 'release/5.5' into develop
d0d8dd4 Squashed 'libs/editor/' changes from a2a6a7c..a92ad9d
d9bd889 Merge commit 'd0d8dd46c2b8223d66ec3e80578788d1b6cd8b85' into release/5.5
38a413e Merge pull request #4239 from wordpress-mobile/issue/3924-method-count
5d5881f Merge commit '937086d17b266a17ea6bdd144656cd5282fa86d7' into issue/4235-locale-getdefault-usage
b0fc653 changed Locale.getDefault() occurrences for the slightly enhanced LanguageUtils.getCurrentDeviceLanguage()
3aa9746 moved LanguageUtils to Utils. + split getDeviceLanguage into Code (for string) and Locale for reuse as suggested in code review by @maxme
e8bc7cb Merge branch 'develop' into issue/3924-method-count
405772b Merge branch 'release/5.5' into develop
771c065 Merge commit '49ac39827552c17c8d5b65eca236a55961cf6814' into release/5.5
87ade41 Merge commit '1cf141b3362c5c44f27a8b65775d3db27ac5756a' into release/5.5
73cdb59 Merge commit '65eec31755233d054ff01bf729eea6d233f6d7df' into release/5.5
9db27cb Merge commit '2fc5d53d4ba45ed45c806a5ac0772458a4ef403e' into release/5.5
79a0669 update compileSdkVersion and buildToolsVersion in every subtrees
c549691 update gradle wrapper to 2.14
5f8b37b Merge branch 'release/5.5' into develop
e0ffd09 Merge commit '19320ef6206ed7104072d5a2f7fb7896c8e84596' into release/5.5
3086a32 Updating gradle plugin to 2.1.2
f7cda1e Merge branch 'hotfix/5.4.1' into release/5.5
9b3840f Merge commit '0e7e33bb330aea12fc3845d1c95b483845e63c6a' into hotfix/5.4.1
704f8db Merge pull request #4165 from wordpress-mobile/issue/4147-translated-original-size
0a145fb Merge commit 'e8a087f9fc25fa4e0dea63715bdd1a05e92f7db0' into hotfix/5.4.1
2dbc2de new MediaUtils function: getImageWidthSettingFromString
380157e Merge commit '961a76c0bc931c3a484640f9fb1e3d6f7877857b' into hotfix/5.4.1
8da6671 Merge branch 'release/5.4' into develop
457afa7 Merge commit '5da21eda6aa762a51acc7f29263ea5b6e42b3cd2' into release/5.4
081a336 Merge pull request #4100 from wordpress-mobile/feature/people-management-sync
6cf2b92 Merge branch 'release/5.4' into develop
196d4db Merge remote-tracking branch 'origin/develop' into feature/people-management-sync
bbc3cdb Clarify comments and parameter names
750ef77 fix #4114: remove the URL scheme if it's not http or https during URL sanitization
d1cbe1f Updating to support library 23.4.0
30c98a2 Merge branch 'develop' into issue/3791-support-library-23.2
4fad089 Merge remote-tracking branch 'origin/develop' into feature/people-management-sync
81c3fe1 Merge branch 'develop' into feature/gravatar-upload-okhttp
cfb9b6e Merge remote-tracking branch 'origin/develop' into feature/people-management-sync
0c22fb1 Merge commit '3b37573c3bef0da83e7c0991c3ddd7069ea34947' into develop
1074c65 Updating gradle plugin to 2.1.0 for Android Studio 2.1.0
c0cfd6e Adds permission utils for calling via fragments
c0459ed Merge remote-tracking branch 'origin/develop' into feature/people-management-sync
54bafee Merge commit 'c0f0848c74ef959fa90d150ae3cf93259c3fd08e' into develop
140b53d Merge branch 'develop' into issue/3791-support-library-23.2
9a92f90 Merge remote-tracking branch 'origin/develop' into feature/people-management-sync
af9844c Merge commit '52910dd0664cf2031a6a1c78f3cb1b170a4eeff9' into issue/editor-p-to-div-update
084c5aa Updating to gradle 2.0
2e62958 Updating support library to 23.3.0
a75ef12 Updating to gradle 2.0
34efe57 Merge branch 'develop' into issue/3791-support-library-23.2
003b573 Updating to rc3
8b8e2a3 Updating build.gradle to latest rc3
cfe3161 Merge branch 'develop' into issue/3791-support-library-23.2
4260b4c Merge pull request #3919 from wordpress-mobile/issue/update-build-tools
31aac03 Merge branch 'feature/people-management-sync' into feature/people-management-network-and-data-layer
231a3d3 Merge branch 'release/5.2' into release/5.3
ee13047 Updating the rest of the modules to buildToolsVersion 23.0.3
1e5c5b4 Updating the rest of the modules to buildToolsVersion 23.0.3
c674a05 Merge branch 'develop' into issue/3791-support-library-23.2
5fdae18 Merge commit '4c9324cf1eee00b66c76e0d5a917c86e1293a845' into develop
806da2e Added People to AppLog
f1fb2d3 update to android-gradle-2.0.0-rc1
5cc12c5 upgrade to gradle plugin 2.0.0-beta7
3a24940 Merge branch 'develop' into issue/3791-support-library-23.2
0a90538 update to com.android.tools.build:gradle:2.0.0-beta7
0acc238 Updating support library to 23.2.1
39c5bab Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into develop
2384a34 Comment getQuantityString()
a11f2f1 use String.format(getString(format), ...) instead of buggy getString(format, ...)
86e6f3d replace plurals with a utility method
17cd3f6 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master
e191d70 Merge commit '8db246f15ce6f4d2c7f7f7ec51c68b87e9a66c2f' into develop
6abfe1f Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master
5bcdcc7 Merge commit 'a03a1465ca3a5e6827a3a4c004b435b1bc0db4ee' into develop
1851efb Mark the util WPEditText as deprecated
4871c5f Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master
4fc64d3 Updated gradle to 2.0.0-beta6
aa8cdac Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master
9cc32d5 Merge commit '108ed89ccdc90830463e57ce4ff5ba64ef0acc8f' into feature/visual-editor
e072fc5 Merge branch 'develop' into feature/visual-editor
b39105c Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-master
87d1cd7 Merge commit '87b5e7c0a01bceedcbad9abb9a2e71505bbfbf48' into feature/visual-editor
e70aee7 Merge branch 'develop' into feature/visual-editor
e67e887 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plan-details-viewpager
f925e0d Merge remote-tracking branch 'origin/develop' into feature/account-settings
493a28a Upgrade gradle plugin to 2.0.0-beta5
96cb4ab Merge commit '68c6f4cd95baefe3198dca9e8bd7d1ee3732f576' into issue/3610-media-tracking-fixes
e0191f1 Merge remote-tracking branch 'origin/develop' into feature/account-settings
3441e62 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/Plans-M1-Show-Plans-List
73e3d28 Fix media isVideo/isValidImage/... utils method
3ed94cf Merge commit '097b51b9618f0fe23146c66b58918651e9c80bbc' into issue/3610-media-tracking-fixes
856eb76 Merge commit '0b9c6088555e856e9fc7cdfe3e1e7b835ea4f08d' into develop
24008e3 Merge remote-tracking branch 'origin/develop' into feature/account-settings
edcbd68 Merge branch 'feature/Plans-M1-Show-Plans-List' of https://github.com/wordpress-mobile/WordPress-Android into feature/3718-show-available-plans
f5b119a Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/Plans-M1-Show-Plans-List
8d98820 Merge pull request #3742 from wordpress-mobile/issue/update-to-android-gradle-plugin-2.0
3b9f0ff update to android gradle plugin beta4
ab9dae2 Merge remote-tracking branch 'origin/develop' into feature/account-settings
a4144bb Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/3718-show-available-plans
141c92d Reverts a previous unnecessary change that's accidentally committed for StringUtils
68a7d4c update to android gradle plugin 2.0.0-beta-2 - Instant Run
a5357b9 moved spinner in CommentsActivity to a more generic FilteredRecyclerView view which can be used in any fragment
c8adccf Use lowercase locale array to make sure language is pre-selected
82a2168 Our API could use "no" to denote false. Make sure our implementation of `getBool` catches it.
64985ea Merge remote-tracking branch 'origin/develop' into feature/account-settings
c18d478 Download available plans for a site. Refactoring!!
c3a1854 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/plans-add-item
34ddb82 Download global plans from wpcom and parse them. Store the response in AppPrefs for now.
d08bbe8 Primary site added to Account Settings (wip)
2ee06c3 Adding SETTINGS log tag and logging unknown language code error
9729cfb Merge develop into site-settings-review
4139806 Merge commit 'a731d835c7f2b60790032ef1ec2f2af403040560' into develop
44d2e6f Merge commit '355e34b84ad8c79589065dafb7cf19b619eb957c' into develop
0cdc639 Add utility methods to check if a URL is wpcom. Add utility methods  that check if it's safe to add the Authentication token to the request.
5055b8a kill StringUtils.getHost function
a5efa15 s/getDomainFromUri/getHost/
e395732 4.9-rc-2 / 228 version bump
283f344 fix #3521: use the simplest UnderlineSpan subclass
dd8da34 Merge branch 'develop' into feature/site-settings-review
e9c777b Allow photon to resize GIFs
2fa7d20 Merge commit '7c21964c64da28781fbb63fa9ea22509d320bb0f' into develop
650e224 Merge branch 'develop' into feature/site-settings-review
0504208 Merge commit '2467f23341a72e17460995133a375e63252e88b3' into feature/sync-editor-lib
48a2e5a fix #3372:Resource Leak in SqlUtils.java
e61338d Merge commit 'ee9a14bc80226f31e589e19d0b7512159c96acb3' into develop
23824e3 Merge commit '090e027e8c0fe0e07e26c1bfedc982c7fa99b124' into develop
7d33be7 Moved the check for video to within ImageUtils
ad9ee4e Merge branch 'develop' into feature/site-settings-review
880519d suppress lint on missing permission
6726085 Updating gradle plugin to 1.5.0 and support/build tools to latest for sub projects
a5b2379 Add log line that could help us in case of errors in the JSON parsing with queryJSON.
1b1e118 Merge branch 'develop' into feature/site-settings-review
20a169b Better solution: Fix the url within PhotonUtils. Hattip @nbradbury
c8fbb97 Revert "Fixes issue where private blog images wouldn't load."
d2c5a3f Revert "Killing whitespace."
5d93dc9 Killing whitespace.
269ecdf Fixes issue where private blog images wouldn't load.
def84af Merge branch 'release/4.7' into feature/site-settings-review
0939a67 Moved permission check and request to PermissionUtils
6f9c027 Checking media permission when attempting to add media to post
5f585df Merge branch 'release/4.6' into issue/3115-runtime-permissions
b68bfa2 first step for runtime location request
be9d2c6 Merge branch 'develop' into feature/site-settings-review
a760b91 Merge branch 'release/4.6' into develop
fecab61 Merge branch 'hotfix/4.5.2' into release/4.6 plus bump version for beta release
270aae7 Merge commit '7b6a9d464896683ba4aef6f4dccc9021641e5d71' into develop
15d4aa8 test queryJSON calls with null params
7ddc84c Check null query string
5f84fbe check null source in JSONUtils.queryJSON()
fe4b7a6 Merge branch 'develop' into feature/site-settings-review
e3636ab update ProfilingUtils usage
0d87149 Merge branch 'develop' into feature/site-settings-review
10c93c3 Add two new functions to Utils that remove the traling slash in a string, and remove the scheme from URL string.
6094d83 Use homeURL instead of hostName to show the blog address. WordPress can be installed in a sub-directory, and so the host name will be the same for two subdir installations on the same host.
2417bae URL Utils test fix
8d781ba Merge branch 'develop' into feature/site-settings-review
62ce487 generic approach to add parameters to a URL
e43fde4 new UrlUtils method: appendPreviewURLParameter
4584693 Updating build tools to 23.0.1
c4e8007 Merge branch 'develop' into feature/site-settings-review
6e4d198 set targetSdkVersion to 23 and clean up lib dependencies
2b95b43 migrate from mavenCentral to jcenter (which is now the default for Android Studio)
f185b2e fix lint errors
77a2df2 update to gradle plugin 1.3.1 and gradle 2.6
815a510 upgrade to gradle 2.5 and gradle plugin 1.3.0
b45bc52 Merge branch 'develop' into feature/update-to-gradle-2.4
1aac66a Merge branch 'develop' into feature/update-to-gradle-2.4
7b427ef Updating ActionBar title. Save button is now Undo.
889623c Merge branch 'hotfix/4.1.1' into release/4.2
3930cca Merge pull request #2878 from wordpress-mobile/issue/2860-npe-post-settings-update
ae06412 Updating EditTextUtils.getText method instead of creating new one.
b4e09e5 limit text to 524288 characters which is always < 2Mb with UTF-8
adb6d46 Merge branch 'hotfix/4.1.1' into release/4.2
7e034f1 fix #2855: delete big comments and truncate new inserted comments
da7a178 Coding Styles
291d107 Make sure the context passed to checkConnection is not null
9431ed1 Updated support library and build tools
3a23b4a update to gradle android plugin 1.2.3
28f0863 update support lib to 22
58c0fff update to android-gradle plugin 1.1.3 and build tools 22.0.1
ab1f64f Introduce our version of MarkView
8a01665 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into issue/masterbar-notifs-self-hosted
519dbb6 Merge commit '40e798bf739c94adbc7aa9156ded0a5ad28dc462' into develop
c83436d Fixed notifications fragment for self-hosted
a30fad3 Merge branch 'release/4.0' into develop
926195e Removing potential race condition with WP image loading threads.
3617ff0 Returning to the post editor won't crash if Activity was destroyed.
e5eb8c7 Add more audio formats
a70f524 Handle audio files in media browser
260faf4 Merge branch 'release/4.0' into develop
a91cbd6 Merge branch 'hotfix/3.9.1' into release/4.0
16e01b6 Catching other unknown URL exception.
d70578c Making sure Cursor is closed if exception gets thrown.
21508f3 Catching unknown URL exceptions.
41e732c Merge branch 'release/4.0' into develop
9915efb Merge remote-tracking branch 'origin/hotfix/3.9.1' into release/4.0
8821cb2 javadocs
1254283 If string is empty return empty string instead of null
a8081b7 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/viewpager-main-activity
04a450e javadocs
17cda45 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/viewpager-main-activity
0d83504 If string is empty return empty string instead of null
fa1c9ce Updated ViewSiteActivity and WebViewActivity to use support toolbar w/o drawer
896b7bd 1.5.0 version bump
565f756 Merge branch 'develop' into feature/modularize-editor
7c7a06f Added support for `WPWebViewClient` to pass the token for image requests.
7a76fe8 Merge branch 'hotfix/3.8.1' into release/3.9
35393b3 fix #2437: clear uploading posts state if the PostUploadService is not running during PostList creation
1837271 Merge branch 'develop' into feature/modularize-editor
112282c fix #2328: sort blogs with an empty title by their hostname
349e94c Merge branch '1628-mediapicker' into feature/modularize-editor
531b986 Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into feature/modularize-editor
ee83fe3 comment CustomSwipeRefreshLayout.onTouchEvent
3d69956 new CustomSwipeRefreshLayout with a workaround to catch onTouchEvent IllegalArgumentException
2b40042 Merge branch 'develop' into feature/modularize-editor
d370d2b Merge pull request #2365 from wordpress-mobile/issue/1827-post-stuck-in-uploading-state
80d824c Merge branch 'develop' into feature/modularize-editor
f0c78fd fix typo in a comment
8fcc28f delay the refreshing anim by 50ms to workaround https://code.google.com/p/android/issues/detail?id=77712
dca8e8b styling update
b4f9350 Merge branch 'release/3.7' into develop
e43ec21 Merge branch 'develop' into feature/modularize-editor
09ce398 fix #2336: check for null text entry, replace them with a string
0a59ffd split MediaUtils in MediaUtils and WordPressMediaUtils - remove references to WordPress.java in MediaUtils
cb0468a move WPUnderlineSpan.java and MediaGalleryImageSpan.java to WPUtils
d9c1111 Merge branch 'develop' into feature/modularize-editor
2b07717 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into issue/2306-reader-feed-preview
d7f6b10 All gravatar requests now default to 404.
fa54198 Added DEFAULT_BLAVATAR constant
b67cc7b WPNetworkImageView now accepts a default error image resource, also forcing size when showing blavatars in ReaderBlogAdapter
f6876ae Moved fixAvatar routine to GravatarUtils
d7ae1ab Added DefaultImage enum to GravatarUtils
55a65b2 move WPImageSpan and MediaFile to WPUtils - also create a WPEditImageSpan class
0a14aa6 Merge commit 'aacdb402f1832ac0ce6db671c853a5dde0424d3d' into feature/modularize-editor
02381ef Removed blogUrl param from showBlogPreview(), added new routines for following/unfollowing blogs & feeds
dea1fbf remove extraneous static field
73dbd93 Merge branch 'develop' into feature/modularize-editor
416c772 move WPEditText to WordPressUtils and reorganize WordPressUtils
559f9b2 First step at extracting the old editor (moving Media related method to the EditPostActivity, they should end up in their own class/lib)
dbd179a Blavatar defaults to 404
ec89c80 Added blavatars to ManageBlogsActivity
f017173 Merge commit '1824f636f3b3c7e35f2c03225c2ca36ed18c16c3' into feature/modularize-editor
75d5f26 Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into develop
38c7a76 Merge branch 'release/3.7' into develop
d61a71f comment addUrlSchemeIfNeeded and why removeLeadingDoubleSlash is used there
52e54c8 Add strip=all to all Photon requests
5416f97 Squashed 'libs/editor/' changes from fc65662..86805a0
29beaed fix #2293: remove leading double slash in URLs returned by wporg servers
27a8d78 Merge branch 'release/3.7' into develop
7c3ec06 fix AppLogViewerActivity when a log is message is null
4c02650 Merge pull request #2264 from wordpress-mobile/issue/2222-theme-preview-title
706a65f new BlogUtils.getHostNameFromAccountMap function
e873ea3 Theme live preview no longer changes the activity title
185582c Photo viewer now uses low quality for the lo-res image
6023822 Simplified comments
0a19498 Switched to quality enum which defaults to medium
5ae1b87 Added default quality param to photon
728a121 html encode log entries in AppLog.toHtml()
cb9fefb fix #103: retain menu drawer scroll position after switching activities
502a9e4 Merge branch 'develop' into issue/985-make-sfactory-private
2818082 fix build files for android studio 1.0
96f3962 Merge remote-tracking branch 'origin/develop' into issue/985-make-sfactory-private
f916a34 update support lib version for travis
195bd96 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/material-appcompat
b28e296 Merge branch 'develop' into release/3.4
743ce48 remove unused code (refresh button)
a9e4c30 fix #985: maks sFactory private - force injection in test module
906b3e8 Merge branch 'release/3.4' into issue/1982-simperium-concurrency Conflicts: 	WordPress/src/main/java/org/wordpress/android/models/Note.java
4ceb0c3 Updated build.gradle to specify com.android.support:appcompat-v7:21.0.2
a9a490b Removed unsuccessful fix for #1982.
957c1b2 first step at replacing PreferenceActivity by a PreferenceFragment + ActionBarActivity
93a23da Merge branch 'develop' into feature/material-appcompat
3f731d6 Merge branch 'release/3.4' into develop
aaccb70 Merge branch 'hotfix/3.3.1' into release/3.4
6a22580 Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into feature/material-appcompat
e470cfb update subtrees to use build tools 21.1.1
dfd77e4 rename PullToRefresh to SwipeToRefresh
dffe39a remove unused viewClass in PTR constructor
0bb12ed fix circle spinner color style
13e613e Return a copy of the JSONObject in getDiffableValue().
52d5ec2 replace Chris Banes' PullToRefresh by the native SwipeToRefresh view
3d9cb0f Merge remote-tracking branch 'origin/develop' into feature/1961-add-mentions-to-commenting
9d2d48b Merge branch 'develop' into issue/1958-round-avatars
bd0a083 Merge remote-tracking branch 'origin/develop' into feature/1961-add-mentions-to-commenting
077c819 Merge branch 'hotfix/3.3.1' into release/3.4
ded9e7c upgrade to android-gradle 0.14.0
fa47b61 Rounds all WPNetworkImageViews with `AVATAR` type.
89d31b5 Initial commit adding mentions to notification comments
f2ed1d3 Added image spans directly instead of using Html.fromHtml().
e154814 Merge branch 'release/3.2' into develop
aeabeae fix debug/release build propagation to sub projects
93935be Merge branch 'release/3.2' into develop
b3f359a Merge pull request #1861 from wordpress-mobile/feature/notifications-redesign
24208fa Merge pull request #1860 from wordpress-mobile/issue/1821-remove-istablet
c7476fc Merge branch 'hotfix/3.1.2' into release/3.2
07bf633 fix #1821: remove DisplayUtis.isTablet() method
0ebd130 Catch NPE in Bitmap.CreateBitmap and make sure the returned bitmap is not null
fdf89f9 Merge branch 'release/3.2' into feature/notifications-redesign
5fca796 Revert "Revert "Merge pull request #1799 from wordpress-mobile/feature/1795-reader-render-attachments""
470f5c8 Merge branch 'release/3.2' into develop
e3795fe Merge branch 'hotfix/3.1.1' into release/3.2
e514f75 Merge branch 'hotfix/3.1.1' into develop
35a51e3 remove isTablet() check
fd177a4 Merge branch 'release/3.2' into feature/notifications-redesign
cb63da7 Revert "Merge pull request #1799 from wordpress-mobile/feature/1795-reader-render-attachments"
ac65c2f Merge branch 'develop' into feature/notifications-redesign
c9232b1 Replaced String.format() with string concatenation in ReaderUtils and PhotonUtils after profiler showed String.format() to be hurting performance
485abe4 fix lint error in utils
5026c92 Merge branch 'develop' into feature/notifications-redesign
eff81c0 Removed aggressive `JSONUtil` logging
0868a89 update support-v13 library to version 19.1.0
5a1e321 Merge pull request #1781 from wordpress-mobile/issue/17760-reader-comment-full-images
91cd079 disable refresh on the attacher
ad64df3 use the PTR library version 0.9.7
7266712 set network refresh mode as default
ac4915a remove unused code
893ec6f add a network mode in PullToRefreshHeaderTransformer to show a different message when network is disabled
f45e000 move NetworkUtils to WPUtils subtree
c050f8e Updated comment
9b96cd2 TextView content is reset to itself to force it to correctly resize using cached image
b1ceab2 More cleanup
9a34a96 Cleanup WPImageGetter based on code analysis
bba036d Merge pull request #1764 from wordpress-mobile/issue/1713-send-version-code-to-mixpanel
efd0501 Merge branch 'release/3.1' into develop
4982d56 Merge commit '3a77c01015919f187852c63c384d9a2a48421d24' into release/3.1
688fb0c fix #1762: show blog url in the share blog spinner if the blog title is an empty string
cdbab65 remove ProfilingUtils.getVersionName calls
e831bcc remove unused method from ProfilingUtils
b5ffc30 move BuildUtils to WPUtils subtree, rename BuildUtils to PackageUtils and add getPackageInfo and getVersionCode methods
9f6d5ce Merge branch 'develop' into feature/notifications-redesign
af63e40 Rewrote the AppLog viewer to use a ListView+adapter
a2f1d4a Merge branch 'develop' into issue/1690-track-last-seen-screen
94f7111 remove unused util file ActivityUtils
ebde141 Merge branch 'develop' into issue/1684-stuck-notifications
2969fde Bump libs/utils version number.
366cf9a Merge pull request #1687 from wordpress-mobile/issue/1685-stats-tooltip-text-size
d07c557 generic way to track last seen activity - requires GET_TASKS permission
0c31abc Use the unicode version of the Horizontal ellipsis char. Restrict the visibility of some methods to private.
5db4a73 Text view that auto adjusts text size to fit within the view.If the text size equals the minimum text size and still does not fit, append with an ellipsis.
f45eed5 Merge pull request #1670 from wordpress-mobile/issue/1668-reader-doesnt-auto-update
c3f80f3 Start the simperium buckets in `onResume` of `NotificationsActivity`. Added some helper methods to `SimperiumUtils` to check authorized status of user.
588649b Merge pull request #1683 from wordpress-mobile/issue/1681-comment-list-crash
259a603 fix #1681: null check
78b8325 Fixed bug in ReaderTagTable that caused tbl_tag_updates to always overwrite the existing row when updating a date column
b18f6ce Merge branch 'Develop' into 'notifications-redesign'

git-subtree-dir: libs/utils
git-subtree-split: 5503849
oguzkocer pushed a commit that referenced this pull request May 23, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants