From 5ead55d67a0fbe11e8b380dd34b82513977fe49f Mon Sep 17 00:00:00 2001 From: Mygod Date: Fri, 13 Jan 2017 02:35:02 +0800 Subject: [PATCH] Rename plugin-lib to plugin --- build.sbt | 6 +++--- {plugin-lib => plugin}/build.sbt | 0 {plugin-lib => plugin}/src/main/AndroidManifest.xml | 0 {plugin-lib => plugin}/src/main/res/values-v21/styles.xml | 0 {plugin-lib => plugin}/src/main/res/values/attrs.xml | 0 {plugin-lib => plugin}/src/main/res/values/colors.xml | 0 {plugin-lib => plugin}/src/main/res/values/styles.xml | 0 .../scala/be/mygod/preference/DialogPreferencePlus.scala | 0 .../main/scala/be/mygod/preference/EditTextPreference.scala | 0 .../mygod/preference/EditTextPreferenceDialogFragment.scala | 0 .../scala/be/mygod/preference/NumberPickerPreference.scala | 0 .../preference/NumberPickerPreferenceDialogFragment.scala | 0 .../main/scala/be/mygod/preference/PreferenceCategory.scala | 0 .../main/scala/be/mygod/preference/PreferenceFragment.scala | 0 .../scala/be/mygod/preference/PreferenceGroupAdapter.scala | 0 .../main/scala/be/mygod/preference/SummaryPreference.scala | 0 16 files changed, 3 insertions(+), 3 deletions(-) rename {plugin-lib => plugin}/build.sbt (100%) rename {plugin-lib => plugin}/src/main/AndroidManifest.xml (100%) rename {plugin-lib => plugin}/src/main/res/values-v21/styles.xml (100%) rename {plugin-lib => plugin}/src/main/res/values/attrs.xml (100%) rename {plugin-lib => plugin}/src/main/res/values/colors.xml (100%) rename {plugin-lib => plugin}/src/main/res/values/styles.xml (100%) rename {plugin-lib => plugin}/src/main/scala/be/mygod/preference/DialogPreferencePlus.scala (100%) rename {plugin-lib => plugin}/src/main/scala/be/mygod/preference/EditTextPreference.scala (100%) rename {plugin-lib => plugin}/src/main/scala/be/mygod/preference/EditTextPreferenceDialogFragment.scala (100%) rename {plugin-lib => plugin}/src/main/scala/be/mygod/preference/NumberPickerPreference.scala (100%) rename {plugin-lib => plugin}/src/main/scala/be/mygod/preference/NumberPickerPreferenceDialogFragment.scala (100%) rename {plugin-lib => plugin}/src/main/scala/be/mygod/preference/PreferenceCategory.scala (100%) rename {plugin-lib => plugin}/src/main/scala/be/mygod/preference/PreferenceFragment.scala (100%) rename {plugin-lib => plugin}/src/main/scala/be/mygod/preference/PreferenceGroupAdapter.scala (100%) rename {plugin-lib => plugin}/src/main/scala/be/mygod/preference/SummaryPreference.scala (100%) diff --git a/build.sbt b/build.sbt index 4851fe6f..3a2908b3 100644 --- a/build.sbt +++ b/build.sbt @@ -20,12 +20,12 @@ lazy val commonSettings = Seq( val supportLibsVersion = "25.1.0" lazy val root = Project(id = "shadowsocks-android", base = file(".")) .settings(commonSettings) - .aggregate(pluginLib, mobile) + .aggregate(plugin, mobile) install in Android := (install in (mobile, Android)).value run in Android := (run in (mobile, Android)).evaluated -lazy val pluginLib = Project(id = "plugin-lib", base = file("plugin-lib")) +lazy val plugin = project .settings(commonSettings) .settings( libraryDependencies ++= @@ -43,4 +43,4 @@ lazy val mobile = project "com.android.support" % "gridlayout-v7" % supportLibsVersion :: Nil ) - .dependsOn(pluginLib) + .dependsOn(plugin) diff --git a/plugin-lib/build.sbt b/plugin/build.sbt similarity index 100% rename from plugin-lib/build.sbt rename to plugin/build.sbt diff --git a/plugin-lib/src/main/AndroidManifest.xml b/plugin/src/main/AndroidManifest.xml similarity index 100% rename from plugin-lib/src/main/AndroidManifest.xml rename to plugin/src/main/AndroidManifest.xml diff --git a/plugin-lib/src/main/res/values-v21/styles.xml b/plugin/src/main/res/values-v21/styles.xml similarity index 100% rename from plugin-lib/src/main/res/values-v21/styles.xml rename to plugin/src/main/res/values-v21/styles.xml diff --git a/plugin-lib/src/main/res/values/attrs.xml b/plugin/src/main/res/values/attrs.xml similarity index 100% rename from plugin-lib/src/main/res/values/attrs.xml rename to plugin/src/main/res/values/attrs.xml diff --git a/plugin-lib/src/main/res/values/colors.xml b/plugin/src/main/res/values/colors.xml similarity index 100% rename from plugin-lib/src/main/res/values/colors.xml rename to plugin/src/main/res/values/colors.xml diff --git a/plugin-lib/src/main/res/values/styles.xml b/plugin/src/main/res/values/styles.xml similarity index 100% rename from plugin-lib/src/main/res/values/styles.xml rename to plugin/src/main/res/values/styles.xml diff --git a/plugin-lib/src/main/scala/be/mygod/preference/DialogPreferencePlus.scala b/plugin/src/main/scala/be/mygod/preference/DialogPreferencePlus.scala similarity index 100% rename from plugin-lib/src/main/scala/be/mygod/preference/DialogPreferencePlus.scala rename to plugin/src/main/scala/be/mygod/preference/DialogPreferencePlus.scala diff --git a/plugin-lib/src/main/scala/be/mygod/preference/EditTextPreference.scala b/plugin/src/main/scala/be/mygod/preference/EditTextPreference.scala similarity index 100% rename from plugin-lib/src/main/scala/be/mygod/preference/EditTextPreference.scala rename to plugin/src/main/scala/be/mygod/preference/EditTextPreference.scala diff --git a/plugin-lib/src/main/scala/be/mygod/preference/EditTextPreferenceDialogFragment.scala b/plugin/src/main/scala/be/mygod/preference/EditTextPreferenceDialogFragment.scala similarity index 100% rename from plugin-lib/src/main/scala/be/mygod/preference/EditTextPreferenceDialogFragment.scala rename to plugin/src/main/scala/be/mygod/preference/EditTextPreferenceDialogFragment.scala diff --git a/plugin-lib/src/main/scala/be/mygod/preference/NumberPickerPreference.scala b/plugin/src/main/scala/be/mygod/preference/NumberPickerPreference.scala similarity index 100% rename from plugin-lib/src/main/scala/be/mygod/preference/NumberPickerPreference.scala rename to plugin/src/main/scala/be/mygod/preference/NumberPickerPreference.scala diff --git a/plugin-lib/src/main/scala/be/mygod/preference/NumberPickerPreferenceDialogFragment.scala b/plugin/src/main/scala/be/mygod/preference/NumberPickerPreferenceDialogFragment.scala similarity index 100% rename from plugin-lib/src/main/scala/be/mygod/preference/NumberPickerPreferenceDialogFragment.scala rename to plugin/src/main/scala/be/mygod/preference/NumberPickerPreferenceDialogFragment.scala diff --git a/plugin-lib/src/main/scala/be/mygod/preference/PreferenceCategory.scala b/plugin/src/main/scala/be/mygod/preference/PreferenceCategory.scala similarity index 100% rename from plugin-lib/src/main/scala/be/mygod/preference/PreferenceCategory.scala rename to plugin/src/main/scala/be/mygod/preference/PreferenceCategory.scala diff --git a/plugin-lib/src/main/scala/be/mygod/preference/PreferenceFragment.scala b/plugin/src/main/scala/be/mygod/preference/PreferenceFragment.scala similarity index 100% rename from plugin-lib/src/main/scala/be/mygod/preference/PreferenceFragment.scala rename to plugin/src/main/scala/be/mygod/preference/PreferenceFragment.scala diff --git a/plugin-lib/src/main/scala/be/mygod/preference/PreferenceGroupAdapter.scala b/plugin/src/main/scala/be/mygod/preference/PreferenceGroupAdapter.scala similarity index 100% rename from plugin-lib/src/main/scala/be/mygod/preference/PreferenceGroupAdapter.scala rename to plugin/src/main/scala/be/mygod/preference/PreferenceGroupAdapter.scala diff --git a/plugin-lib/src/main/scala/be/mygod/preference/SummaryPreference.scala b/plugin/src/main/scala/be/mygod/preference/SummaryPreference.scala similarity index 100% rename from plugin-lib/src/main/scala/be/mygod/preference/SummaryPreference.scala rename to plugin/src/main/scala/be/mygod/preference/SummaryPreference.scala