Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WordPress/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ dependencies {
exclude group: "com.android.volley"
exclude group: 'org.wordpress', module: 'utils'
}
implementation (project(path:':libs:analytics:WordPressAnalytics')) {
implementation (project(path:':libs:analytics')) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we use :libs:WordPressAnalytics instead, so it's consistent with :libs:WordPressProcessors, :libs:WordPressAnnotations etc?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👋 @oguzkocer and thank you so much for the suggestion! 🙏

I actually considered that too while doing this change, but I ended up in favor of the plain analytics naming instead of WordPressAnalytics for the below two main reasons:

  1. We are already in the context of the WordPress repo, as such, having to add the WordPress prefix to every module seems unnecessary.
  2. This repo, in addition to the WordPress app is also building the Jetpack app. As such, it might be better to remove the word WordPress from every module so that to avoid any Jetpack related naming confusion.

To that end, I was thinking to also rename the WordPressProcessors and WordPressAnnotations modules to plain processors and annotations in order to have every module naming consistent from now on.

In the end, I am planning to end up with the below module names:

  • analytics (from WordPressAnalytics)
  • editor (from WordPressEditor)
  • editor-example (from editor/example)
  • image-editor (from ImageEditor)
  • mocks (from WordPressMocks)
  • networking (from WordPressNetworking)
  • annotations (from WordPressAnnotations)
  • processors (from WordPressProcessors)

Let me know what you think. 🤔 🙇

PS: You will also notice the editor-example:

  • I also want to have it build and be part of our active modules as it is currently not.
  • I am thinking of moving it up to the same level as every other module for now, just for simplicity sake and until we figure out how modularization and the organization of it would look like as we progress forward with the main modularization project (TBD).

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good to me. As long as we are consistent, I don't mind either naming and your reasoning makes sense to me for going with the shorter version.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, yes, consistency matters, thanks for giving me the 👍 on it @oguzkocer ! 🙇

exclude group: 'org.wordpress', module: 'utils'
}
implementation (project(path:':libs:editor:WordPressEditor')) {
Expand Down
25 changes: 0 additions & 25 deletions libs/analytics/.gitignore

This file was deleted.

14 changes: 2 additions & 12 deletions libs/analytics/README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
# WordPressCom-Analytics-Android
# Analytics

Library for handling Analytics tracking in WordPress Android.

Part of the [WordPress-Android] project.

[WordPress-Android]: https://github.com/wordpress-mobile/WordPress-Android

## Publish it to bintray

```shell
$ ./gradlew assemble publishToMavenLocal bintrayUpload -PbintrayUser=FIXME -PbintrayKey=FIXME -PdryRun=false
```
Module for handling Analytics tracking.
31 changes: 0 additions & 31 deletions libs/analytics/WordPressAnalytics/build.gradle

This file was deleted.

6 changes: 0 additions & 6 deletions libs/analytics/WordPressAnalytics/gradle.properties-example

This file was deleted.

31 changes: 31 additions & 0 deletions libs/analytics/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
plugins {
id "com.android.library"
}

repositories {
maven {
url "https://a8c-libs.s3.amazonaws.com/android"
content {
includeGroup "org.wordpress"
includeGroup "com.automattic"
includeGroup "com.automattic.tracks"
}
}
}

dependencies {
implementation "com.automattic:Automattic-Tracks-Android:$tracksVersion"
implementation "org.wordpress:utils:$wordPressUtilsVersion"

lintChecks 'org.wordpress:lint:1.1.0'
}

android {
compileSdkVersion 29

defaultConfig {
minSdkVersion rootProject.minSdkVersion
targetSdkVersion rootProject.targetSdkVersion
}
}

1 change: 0 additions & 1 deletion libs/analytics/settings.gradle

This file was deleted.

2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ include ':WordPress'

include ':libs:image-editor:ImageEditor'
include ':libs:networking:WordPressNetworking'
include ':libs:analytics:WordPressAnalytics'
include ':libs:analytics'
include ':libs:editor:WordPressEditor'
include ':libs:WordPressProcessors'
include ':libs:WordPressAnnotations'
Expand Down