From a2b58435ab552e65711a788131de88de5f2d7d82 Mon Sep 17 00:00:00 2001 From: Ali Asadi Date: Tue, 27 Aug 2019 18:35:37 +0300 Subject: [PATCH 1/2] update module name from power-preference-lib to power-preference --- {power-preference-lib => power-preference}/.gitignore | 0 {power-preference-lib => power-preference}/build.gradle | 0 .../consumer-proguard-rules.pro | 0 .../androidTest/java/com/preference/PowerPreferenceTest.java | 0 .../src/androidTest/java/com/preference/SampleObject.java | 0 .../src/main/AndroidManifest.xml | 0 .../src/main/java/com/preference/MapStructure.java | 0 .../src/main/java/com/preference/PowerPreference.java | 0 .../src/main/java/com/preference/Preference.java | 0 .../src/main/java/com/preference/PreferenceCreator.java | 0 .../src/main/java/com/preference/PreferenceManager.java | 0 .../src/main/java/com/preference/model/PreferenceFile.java | 0 .../src/main/java/com/preference/model/PreferenceItem.java | 0 .../src/main/java/com/preference/model/PreferenceType.java | 0 .../main/java/com/preference/provider/PreferenceProvider.java | 0 .../src/main/java/com/preference/ui/debug/DebugActivity.java | 0 .../src/main/java/com/preference/ui/debug/DebugAdapter.java | 0 .../src/main/java/com/preference/ui/debug/DebugContract.java | 0 .../src/main/java/com/preference/ui/debug/DebugPresenter.java | 0 .../src/main/java/com/preference/ui/util/DialogUtils.java | 0 .../src/main/res/layout/activity_preference.xml | 0 .../src/main/res/layout/dialog_edit_value.xml | 0 .../src/main/res/layout/row_preference_boolean.xml | 0 .../src/main/res/layout/row_preference_default.xml | 0 .../src/main/res/layout/row_preference_title.xml | 0 .../src/main/res/menu/preference_menu.xml | 0 .../src/main/res/values/styles.xml | 0 .../src/test/java/com/preference/PowerPreferenceUnitTest.java | 0 sample-app/build.gradle | 2 +- settings.gradle | 2 +- 30 files changed, 2 insertions(+), 2 deletions(-) rename {power-preference-lib => power-preference}/.gitignore (100%) rename {power-preference-lib => power-preference}/build.gradle (100%) rename {power-preference-lib => power-preference}/consumer-proguard-rules.pro (100%) rename {power-preference-lib => power-preference}/src/androidTest/java/com/preference/PowerPreferenceTest.java (100%) rename {power-preference-lib => power-preference}/src/androidTest/java/com/preference/SampleObject.java (100%) rename {power-preference-lib => power-preference}/src/main/AndroidManifest.xml (100%) rename {power-preference-lib => power-preference}/src/main/java/com/preference/MapStructure.java (100%) rename {power-preference-lib => power-preference}/src/main/java/com/preference/PowerPreference.java (100%) rename {power-preference-lib => power-preference}/src/main/java/com/preference/Preference.java (100%) rename {power-preference-lib => power-preference}/src/main/java/com/preference/PreferenceCreator.java (100%) rename {power-preference-lib => power-preference}/src/main/java/com/preference/PreferenceManager.java (100%) rename {power-preference-lib => power-preference}/src/main/java/com/preference/model/PreferenceFile.java (100%) rename {power-preference-lib => power-preference}/src/main/java/com/preference/model/PreferenceItem.java (100%) rename {power-preference-lib => power-preference}/src/main/java/com/preference/model/PreferenceType.java (100%) rename {power-preference-lib => power-preference}/src/main/java/com/preference/provider/PreferenceProvider.java (100%) rename {power-preference-lib => power-preference}/src/main/java/com/preference/ui/debug/DebugActivity.java (100%) rename {power-preference-lib => power-preference}/src/main/java/com/preference/ui/debug/DebugAdapter.java (100%) rename {power-preference-lib => power-preference}/src/main/java/com/preference/ui/debug/DebugContract.java (100%) rename {power-preference-lib => power-preference}/src/main/java/com/preference/ui/debug/DebugPresenter.java (100%) rename {power-preference-lib => power-preference}/src/main/java/com/preference/ui/util/DialogUtils.java (100%) rename {power-preference-lib => power-preference}/src/main/res/layout/activity_preference.xml (100%) rename {power-preference-lib => power-preference}/src/main/res/layout/dialog_edit_value.xml (100%) rename {power-preference-lib => power-preference}/src/main/res/layout/row_preference_boolean.xml (100%) rename {power-preference-lib => power-preference}/src/main/res/layout/row_preference_default.xml (100%) rename {power-preference-lib => power-preference}/src/main/res/layout/row_preference_title.xml (100%) rename {power-preference-lib => power-preference}/src/main/res/menu/preference_menu.xml (100%) rename {power-preference-lib => power-preference}/src/main/res/values/styles.xml (100%) rename {power-preference-lib => power-preference}/src/test/java/com/preference/PowerPreferenceUnitTest.java (100%) diff --git a/power-preference-lib/.gitignore b/power-preference/.gitignore similarity index 100% rename from power-preference-lib/.gitignore rename to power-preference/.gitignore diff --git a/power-preference-lib/build.gradle b/power-preference/build.gradle similarity index 100% rename from power-preference-lib/build.gradle rename to power-preference/build.gradle diff --git a/power-preference-lib/consumer-proguard-rules.pro b/power-preference/consumer-proguard-rules.pro similarity index 100% rename from power-preference-lib/consumer-proguard-rules.pro rename to power-preference/consumer-proguard-rules.pro diff --git a/power-preference-lib/src/androidTest/java/com/preference/PowerPreferenceTest.java b/power-preference/src/androidTest/java/com/preference/PowerPreferenceTest.java similarity index 100% rename from power-preference-lib/src/androidTest/java/com/preference/PowerPreferenceTest.java rename to power-preference/src/androidTest/java/com/preference/PowerPreferenceTest.java diff --git a/power-preference-lib/src/androidTest/java/com/preference/SampleObject.java b/power-preference/src/androidTest/java/com/preference/SampleObject.java similarity index 100% rename from power-preference-lib/src/androidTest/java/com/preference/SampleObject.java rename to power-preference/src/androidTest/java/com/preference/SampleObject.java diff --git a/power-preference-lib/src/main/AndroidManifest.xml b/power-preference/src/main/AndroidManifest.xml similarity index 100% rename from power-preference-lib/src/main/AndroidManifest.xml rename to power-preference/src/main/AndroidManifest.xml diff --git a/power-preference-lib/src/main/java/com/preference/MapStructure.java b/power-preference/src/main/java/com/preference/MapStructure.java similarity index 100% rename from power-preference-lib/src/main/java/com/preference/MapStructure.java rename to power-preference/src/main/java/com/preference/MapStructure.java diff --git a/power-preference-lib/src/main/java/com/preference/PowerPreference.java b/power-preference/src/main/java/com/preference/PowerPreference.java similarity index 100% rename from power-preference-lib/src/main/java/com/preference/PowerPreference.java rename to power-preference/src/main/java/com/preference/PowerPreference.java diff --git a/power-preference-lib/src/main/java/com/preference/Preference.java b/power-preference/src/main/java/com/preference/Preference.java similarity index 100% rename from power-preference-lib/src/main/java/com/preference/Preference.java rename to power-preference/src/main/java/com/preference/Preference.java diff --git a/power-preference-lib/src/main/java/com/preference/PreferenceCreator.java b/power-preference/src/main/java/com/preference/PreferenceCreator.java similarity index 100% rename from power-preference-lib/src/main/java/com/preference/PreferenceCreator.java rename to power-preference/src/main/java/com/preference/PreferenceCreator.java diff --git a/power-preference-lib/src/main/java/com/preference/PreferenceManager.java b/power-preference/src/main/java/com/preference/PreferenceManager.java similarity index 100% rename from power-preference-lib/src/main/java/com/preference/PreferenceManager.java rename to power-preference/src/main/java/com/preference/PreferenceManager.java diff --git a/power-preference-lib/src/main/java/com/preference/model/PreferenceFile.java b/power-preference/src/main/java/com/preference/model/PreferenceFile.java similarity index 100% rename from power-preference-lib/src/main/java/com/preference/model/PreferenceFile.java rename to power-preference/src/main/java/com/preference/model/PreferenceFile.java diff --git a/power-preference-lib/src/main/java/com/preference/model/PreferenceItem.java b/power-preference/src/main/java/com/preference/model/PreferenceItem.java similarity index 100% rename from power-preference-lib/src/main/java/com/preference/model/PreferenceItem.java rename to power-preference/src/main/java/com/preference/model/PreferenceItem.java diff --git a/power-preference-lib/src/main/java/com/preference/model/PreferenceType.java b/power-preference/src/main/java/com/preference/model/PreferenceType.java similarity index 100% rename from power-preference-lib/src/main/java/com/preference/model/PreferenceType.java rename to power-preference/src/main/java/com/preference/model/PreferenceType.java diff --git a/power-preference-lib/src/main/java/com/preference/provider/PreferenceProvider.java b/power-preference/src/main/java/com/preference/provider/PreferenceProvider.java similarity index 100% rename from power-preference-lib/src/main/java/com/preference/provider/PreferenceProvider.java rename to power-preference/src/main/java/com/preference/provider/PreferenceProvider.java diff --git a/power-preference-lib/src/main/java/com/preference/ui/debug/DebugActivity.java b/power-preference/src/main/java/com/preference/ui/debug/DebugActivity.java similarity index 100% rename from power-preference-lib/src/main/java/com/preference/ui/debug/DebugActivity.java rename to power-preference/src/main/java/com/preference/ui/debug/DebugActivity.java diff --git a/power-preference-lib/src/main/java/com/preference/ui/debug/DebugAdapter.java b/power-preference/src/main/java/com/preference/ui/debug/DebugAdapter.java similarity index 100% rename from power-preference-lib/src/main/java/com/preference/ui/debug/DebugAdapter.java rename to power-preference/src/main/java/com/preference/ui/debug/DebugAdapter.java diff --git a/power-preference-lib/src/main/java/com/preference/ui/debug/DebugContract.java b/power-preference/src/main/java/com/preference/ui/debug/DebugContract.java similarity index 100% rename from power-preference-lib/src/main/java/com/preference/ui/debug/DebugContract.java rename to power-preference/src/main/java/com/preference/ui/debug/DebugContract.java diff --git a/power-preference-lib/src/main/java/com/preference/ui/debug/DebugPresenter.java b/power-preference/src/main/java/com/preference/ui/debug/DebugPresenter.java similarity index 100% rename from power-preference-lib/src/main/java/com/preference/ui/debug/DebugPresenter.java rename to power-preference/src/main/java/com/preference/ui/debug/DebugPresenter.java diff --git a/power-preference-lib/src/main/java/com/preference/ui/util/DialogUtils.java b/power-preference/src/main/java/com/preference/ui/util/DialogUtils.java similarity index 100% rename from power-preference-lib/src/main/java/com/preference/ui/util/DialogUtils.java rename to power-preference/src/main/java/com/preference/ui/util/DialogUtils.java diff --git a/power-preference-lib/src/main/res/layout/activity_preference.xml b/power-preference/src/main/res/layout/activity_preference.xml similarity index 100% rename from power-preference-lib/src/main/res/layout/activity_preference.xml rename to power-preference/src/main/res/layout/activity_preference.xml diff --git a/power-preference-lib/src/main/res/layout/dialog_edit_value.xml b/power-preference/src/main/res/layout/dialog_edit_value.xml similarity index 100% rename from power-preference-lib/src/main/res/layout/dialog_edit_value.xml rename to power-preference/src/main/res/layout/dialog_edit_value.xml diff --git a/power-preference-lib/src/main/res/layout/row_preference_boolean.xml b/power-preference/src/main/res/layout/row_preference_boolean.xml similarity index 100% rename from power-preference-lib/src/main/res/layout/row_preference_boolean.xml rename to power-preference/src/main/res/layout/row_preference_boolean.xml diff --git a/power-preference-lib/src/main/res/layout/row_preference_default.xml b/power-preference/src/main/res/layout/row_preference_default.xml similarity index 100% rename from power-preference-lib/src/main/res/layout/row_preference_default.xml rename to power-preference/src/main/res/layout/row_preference_default.xml diff --git a/power-preference-lib/src/main/res/layout/row_preference_title.xml b/power-preference/src/main/res/layout/row_preference_title.xml similarity index 100% rename from power-preference-lib/src/main/res/layout/row_preference_title.xml rename to power-preference/src/main/res/layout/row_preference_title.xml diff --git a/power-preference-lib/src/main/res/menu/preference_menu.xml b/power-preference/src/main/res/menu/preference_menu.xml similarity index 100% rename from power-preference-lib/src/main/res/menu/preference_menu.xml rename to power-preference/src/main/res/menu/preference_menu.xml diff --git a/power-preference-lib/src/main/res/values/styles.xml b/power-preference/src/main/res/values/styles.xml similarity index 100% rename from power-preference-lib/src/main/res/values/styles.xml rename to power-preference/src/main/res/values/styles.xml diff --git a/power-preference-lib/src/test/java/com/preference/PowerPreferenceUnitTest.java b/power-preference/src/test/java/com/preference/PowerPreferenceUnitTest.java similarity index 100% rename from power-preference-lib/src/test/java/com/preference/PowerPreferenceUnitTest.java rename to power-preference/src/test/java/com/preference/PowerPreferenceUnitTest.java diff --git a/sample-app/build.gradle b/sample-app/build.gradle index 24f44fc..80e8c93 100644 --- a/sample-app/build.gradle +++ b/sample-app/build.gradle @@ -23,7 +23,7 @@ dependencies { //implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.android.support.constraint:constraint-layout:1.1.3' - implementation project(':power-preference-lib') + implementation project(':power-preference') androidTestImplementation 'org.mockito:mockito-android:2.7.22' testImplementation 'org.mockito:mockito-core:2.23.0' diff --git a/settings.gradle b/settings.gradle index 2e7fc57..acb39f1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':sample-app', ':power-preference-lib' +include ':sample-app', ':power-preference' From b5567e332a048334611e7b5caed86e783e5b736b Mon Sep 17 00:00:00 2001 From: Ali Asadi Date: Wed, 28 Aug 2019 11:19:55 +0300 Subject: [PATCH 2/2] fix travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9c016e7..04aa1af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,4 +20,4 @@ before_install: - chmod +x gradlew script: - - ./gradlew power-preference-lib:test \ No newline at end of file + - ./gradlew power-preference:test \ No newline at end of file