Skip to content

Commit

Permalink
Merge branch 'develop' into issue/13268-polish-calendar-ui
Browse files Browse the repository at this point in the history
  • Loading branch information
@malinajirka
malinajirka committed Dec 14, 2020
2 parents 9be6009 + 146a442 commit 7d2f683
Show file tree
Hide file tree
Showing 279 changed files with 5,431 additions and 12,538 deletions.
13 changes: 1 addition & 12 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ commands:
steps:
- run:
name: Setup gradle.properties
command: cp gradle.properties-example gradle.properties && cp libs/utils/WordPressUtils/gradle.properties-example libs/utils/WordPressUtils/gradle.properties
command: cp gradle.properties-example gradle.properties
update-gradle-memory:
parameters:
jvmargs:
Expand Down Expand Up @@ -130,11 +130,6 @@ jobs:
environment:
SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD: 1
command: SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD=1 ./gradlew testVanillaRelease --stacktrace --no-daemon
- run:
name: Test WordPressUtils
environment:
SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD: 1
command: cd libs/utils && ./gradlew --stacktrace testReleaseUnitTest
- run:
name: Test WordPressProcessors
environment:
Expand Down Expand Up @@ -606,12 +601,6 @@ workflows:
filters:
branches:
ignore: /pull\/[0-9]+/
- WordPressUtils Connected Tests:
requires:
- gutenberg-bundle-build
filters:
branches:
ignore: /pull\/[0-9]+/
- Connected Tests:
requires:
- gutenberg-bundle-build
Expand Down
6 changes: 5 additions & 1 deletion RELEASE-NOTES.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
16.4
-----
* [*] My Site: Fixes crash on rotation while editing site title [https://github.com/wordpress-mobile/WordPress-Android/pull/13505]

* [**] Posts List: Adds duplicate post functionality [https://github.com/wordpress-mobile/WordPress-Android/pull/13521]
* [*] Block Editor: Fix Gallery block uploads when the editor is closed [https://github.com/wordpress-mobile/WordPress-Android/pull/13570]
* [**] Block Editor: Fixed an issue where a block would disappear when deleting all of the text inside without requiring the extra backspace to remove the block. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/2877]
* [***] Block Editor: New Block: File [https://github.com/wordpress-mobile/gutenberg-mobile/pull/2835]

16.3
-----
* [***] Site Creation: Adds an option to pick a home page design when creating a WordPress.com site.
Expand Down
29 changes: 19 additions & 10 deletions WordPress/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ android {
if (project.hasProperty("versionName")) {
versionName project.property("versionName")
} else {
versionName "alpha-261"
versionName "alpha-262"
}
versionCode 965
versionCode 967
minSdkVersion rootProject.minSdkVersion
targetSdkVersion rootProject.targetSdkVersion

Expand Down Expand Up @@ -98,9 +98,9 @@ android {
dimension "buildType"
// Only set the release version if one isn't provided
if (!project.hasProperty("versionName")) {
versionName "16.3-rc-2"
versionName "16.3"
}
versionCode 964
versionCode 968
buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "false"
buildConfigField "boolean", "TENOR_AVAILABLE", "false"
buildConfigField "long", "REMOTE_CONFIG_FETCH_INTERVAL", "3600"
Expand Down Expand Up @@ -313,21 +313,28 @@ dependencies {

implementation("$gradle.ext.fluxCBinaryPath:fluxc:$fluxCVersion") {
exclude group: "com.android.volley"
exclude group: 'org.wordpress', module: 'utils'
}

implementation ('com.github.indexos.media-for-mobile:android:43a9026f0973a2f0a74fa813132f6a16f7499c3a')

implementation project(path:':libs:utils:WordPressUtils')
testImplementation project(path:':libs:utils:WordPressUtils')
debugImplementation project(path:':libs:utils:WordPressUtils')
implementation "$gradle.ext.wputilsBinaryPath:$wordPressUtilsVersion"
testImplementation "$gradle.ext.wputilsBinaryPath:$wordPressUtilsVersion"
debugImplementation "$gradle.ext.wputilsBinaryPath:$wordPressUtilsVersion"
implementation (project(path:':libs:networking:WordPressNetworking')) {
exclude group: "com.android.volley"
exclude group: 'org.wordpress', module: 'utils'
}
implementation (project(path:':libs:analytics:WordPressAnalytics')) {
exclude group: 'org.wordpress', module: 'utils'
}
implementation (project(path:':libs:editor:WordPressEditor')) {
exclude group: 'org.wordpress', module: 'utils'
}
implementation project(path:':libs:analytics:WordPressAnalytics')
implementation project(path:':libs:editor:WordPressEditor')
implementation (project(path:':libs:login:WordPressLoginFlow')) {
exclude group: "com.github.wordpress-mobile.WordPress-FluxC-Android", module: "fluxc"
exclude group: 'com.github.bumptech.glide'
exclude group: 'org.wordpress', module: 'utils'
}

implementation (group: 'com.zendesk', name: 'support', version: '5.0.1') {
Expand Down Expand Up @@ -363,12 +370,14 @@ dependencies {

implementation "org.jsoup:jsoup:1.10.3"
implementation 'androidx.emoji:emoji:1.0.0'

// Enables accessibility checks in Espresso
androidTestImplementation 'androidx.test.espresso:espresso-accessibility:3.3.0-alpha05'
}

configurations.all {
// Exclude packaged wordpress sub projects, force the use of the source project
// (eg. use :libs:utils:WordPressUtils instead of 'org.wordpress:utils')
exclude group: 'org.wordpress', module: 'utils'
exclude group: 'org.wordpress', module: 'analytics'
}

Expand Down
201 changes: 16 additions & 185 deletions WordPress/lint-baseline.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,22 +84,6 @@
column="20"/>
</issue>

<issue
id="ExifInterface"
severity="Warning"
message="Avoid using `android.media.ExifInterface`; use `android.support.media.ExifInterface` from the support library instead"
category="Correctness"
priority="6"
summary="Using `android.media.ExifInterface`"
explanation="The `android.media.ExifInterface` implementation has some known security bugs in older versions of Android. There is a new implementation available of this library in the support library, which is preferable."
errorLine1="import android.media.ExifInterface;"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="../libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ImageUtils.java"
line="17"
column="8"/>
</issue>

<issue
id="LocaleFolder"
severity="Warning"
Expand Down Expand Up @@ -215,23 +199,6 @@
column="9"/>
</issue>

<issue
id="GradleDependency"
severity="Warning"
message="A newer version of com.android.tools.build:gradle than 3.2.1 is available: 3.3.0"
category="Correctness"
priority="4"
summary="Obsolete Gradle Dependency"
explanation="This detector looks for usages of libraries where the version you are using is not the current stable release. Using older versions is fine, and there are cases where you deliberately want to stick with an older version. However, you may simply not be aware that a more recent version is available, and that is what this lint check helps find."
errorLine1=" classpath &apos;com.android.tools.build:gradle:3.3.2&apos;"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
quickfix="studio">
<location
file="../libs/utils/WordPressUtils/build.gradle"
line="7"
column="9"/>
</issue>

<issue
id="GradleDependency"
severity="Warning"
Expand All @@ -249,23 +216,6 @@
column="9"/>
</issue>

<issue
id="GradleDependency"
severity="Warning"
message="A newer version of com.android.support:design than 27.1.1 is available: 28.0.0"
category="Correctness"
priority="4"
summary="Obsolete Gradle Dependency"
explanation="This detector looks for usages of libraries where the version you are using is not the current stable release. Using older versions is fine, and there are cases where you deliberately want to stick with an older version. However, you may simply not be aware that a more recent version is available, and that is what this lint check helps find."
errorLine1=" implementation &apos;com.android.support:design:27.1.1&apos;"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
quickfix="studio">
<location
file="../libs/utils/WordPressUtils/build.gradle"
line="23"
column="5"/>
</issue>

<issue
id="GradleDependency"
severity="Warning"
Expand All @@ -283,23 +233,6 @@
column="5"/>
</issue>

<issue
id="GradleDependency"
severity="Warning"
message="A newer version of com.android.support:recyclerview-v7 than 27.1.1 is available: 28.0.0"
category="Correctness"
priority="4"
summary="Obsolete Gradle Dependency"
explanation="This detector looks for usages of libraries where the version you are using is not the current stable release. Using older versions is fine, and there are cases where you deliberately want to stick with an older version. However, you may simply not be aware that a more recent version is available, and that is what this lint check helps find."
errorLine1=" implementation &apos;com.android.support:recyclerview-v7:27.1.1&apos;"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
quickfix="studio">
<location
file="../libs/utils/WordPressUtils/build.gradle"
line="24"
column="5"/>
</issue>

<issue
id="GradleDependency"
severity="Warning"
Expand Down Expand Up @@ -503,108 +436,6 @@
file="../org/jsoup/helper/HttpConnection$Response$2.class"/>
</issue>

<issue
id="ObsoleteSdkInt"
severity="Error"
message="Unnecessary; SDK_INT is never &lt; 21"
category="Performance"
priority="6"
summary="Obsolete SDK_INT Version Check"
explanation="This check flags version checks that are not necessary, because the `minSdkVersion` (or surrounding known API level) is already at least as high as the version checked for.&#xA;&#xA;Similarly, it also looks for resources in `-vNN` folders, such as `values-v14` where the version qualifier is less than or equal to the `minSdkVersion`, where the contents should be merged into the best folder."
errorLine1=" if (Build.VERSION.SDK_INT &lt; Build.VERSION_CODES.JELLY_BEAN_MR1) {"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
quickfix="studio">
<location
file="../libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/DeviceUtils.java"
line="52"
column="13"/>
</issue>

<issue
id="ObsoleteSdkInt"
severity="Error"
message="Unnecessary; SDK_INT is always >= 21"
category="Performance"
priority="6"
summary="Obsolete SDK_INT Version Check"
explanation="This check flags version checks that are not necessary, because the `minSdkVersion` (or surrounding known API level) is already at least as high as the version checked for.&#xA;&#xA;Similarly, it also looks for resources in `-vNN` folders, such as `values-v14` where the version qualifier is less than or equal to the `minSdkVersion`, where the contents should be merged into the best folder."
errorLine1=" if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR2) {"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
quickfix="studio">
<location
file="../libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/DeviceUtils.java"
line="144"
column="13"/>
</issue>

<issue
id="ObsoleteSdkInt"
severity="Error"
message="Unnecessary; SDK_INT is always >= 21"
category="Performance"
priority="6"
summary="Obsolete SDK_INT Version Check"
explanation="This check flags version checks that are not necessary, because the `minSdkVersion` (or surrounding known API level) is already at least as high as the version checked for.&#xA;&#xA;Similarly, it also looks for resources in `-vNN` folders, such as `values-v14` where the version qualifier is less than or equal to the `minSdkVersion`, where the contents should be merged into the best folder."
errorLine1=" private static final boolean HAS_EMOJI = SDK_INT >= VERSION_CODES.JELLY_BEAN;"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
quickfix="studio">
<location
file="../libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/EmoticonsUtils.java"
line="19"
column="46"/>
</issue>

<issue
id="ObsoleteSdkInt"
severity="Error"
message="Unnecessary; SDK_INT is always >= 21"
category="Performance"
priority="6"
summary="Obsolete SDK_INT Version Check"
explanation="This check flags version checks that are not necessary, because the `minSdkVersion` (or surrounding known API level) is already at least as high as the version checked for.&#xA;&#xA;Similarly, it also looks for resources in `-vNN` folders, such as `values-v14` where the version qualifier is less than or equal to the `minSdkVersion`, where the contents should be merged into the best folder."
errorLine1=" final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
quickfix="studio">
<location
file="../libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/MediaUtils.java"
line="440"
column="34"/>
</issue>

<issue
id="ObsoleteSdkInt"
severity="Error"
message="Unnecessary; SDK_INT is never &lt; 21"
category="Performance"
priority="6"
summary="Obsolete SDK_INT Version Check"
explanation="This check flags version checks that are not necessary, because the `minSdkVersion` (or surrounding known API level) is already at least as high as the version checked for.&#xA;&#xA;Similarly, it also looks for resources in `-vNN` folders, such as `values-v14` where the version qualifier is less than or equal to the `minSdkVersion`, where the contents should be merged into the best folder."
errorLine1=" if (Build.VERSION.SDK_INT &lt; Build.VERSION_CODES.JELLY_BEAN_MR1) {"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
quickfix="studio">
<location
file="../libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/NetworkUtils.java"
line="79"
column="13"/>
</issue>

<issue
id="ObsoleteSdkInt"
severity="Error"
message="Unnecessary; SDK_INT is always >= 21"
category="Performance"
priority="6"
summary="Obsolete SDK_INT Version Check"
explanation="This check flags version checks that are not necessary, because the `minSdkVersion` (or surrounding known API level) is already at least as high as the version checked for.&#xA;&#xA;Similarly, it also looks for resources in `-vNN` folders, such as `values-v14` where the version qualifier is less than or equal to the `minSdkVersion`, where the contents should be merged into the best folder."
errorLine1=" if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) {"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
quickfix="studio">
<location
file="../libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ViewUtils.java"
line="27"
column="13"/>
</issue>

<issue
id="ObsoleteSdkInt"
severity="Error"
Expand Down Expand Up @@ -2769,22 +2600,6 @@
column="20"/>
</issue>

<issue
id="ClickableViewAccessibility"
severity="Error"
message="Custom view `CustomSwipeRefreshLayout` overrides `onTouchEvent` but not `performClick`"
category="Accessibility"
priority="6"
summary="Accessibility in Custom Views"
explanation="If a `View` that overrides `onTouchEvent` or uses an `OnTouchListener` does not also implement `performClick` and call it when clicks are detected, the `View` may not handle accessibility actions properly. Logic handling the click actions should ideally be placed in `View#performClick` as some accessibility services invoke `performClick` when a click action should occur."
errorLine1=" public boolean onTouchEvent(MotionEvent event) {"
errorLine2=" ~~~~~~~~~~~~">
<location
file="../libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/widgets/CustomSwipeRefreshLayout.java"
line="21"
column="20"/>
</issue>

<issue
id="ClickableViewAccessibility"
severity="Error"
Expand Down Expand Up @@ -4245,4 +4060,20 @@
column="28"/>
</issue>

<issue
id="ResourceType"
severity="Error"
message="Expected a color resource id (`R.color.`) but received an RGB integer"
category="Correctness"
priority="7"
summary="Wrong Resource Type"
explanation="Ensures that resource id&apos;s passed to APIs are of the right type; for example, calling `Resources.getColor(R.string.name)` is wrong."
errorLine1=" return new SwipeToRefreshHelper(swipeRefreshLayout, listener, backgroundColor, primaryProgressColor,"
errorLine2=" ~~~~~~~~~~~~~~~">
<location
file="../WordPress/src/main/java/org/wordpress/android/util/WPSwipeToRefreshHelper.java"
line="33"
column="71"/>
</issue>

</issues>
Loading

0 comments on commit 7d2f683

Please sign in to comment.