diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fd9f4ea8..ef52e895 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,26 +1,61 @@ name: CI on: + push: + branches: [main] + # Release tag format is v[version] + # For example: v1.3.5 + tags: ["v*"] pull_request: - branches: [ main ] + branches: [main] jobs: - build: + check: name: Check runs-on: ubuntu-latest - steps: - - name: Checkout sources - uses: actions/checkout@v3 - - - name: set up JDK - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'temurin' + - name: Checkout sources + uses: actions/checkout@v4 + - name: Setup Java + uses: actions/setup-java@v4 + with: + distribution: "temurin" + java-version: 17 + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + - name: Run Check + run: ./gradlew check - - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 + publish: + name: Publish + needs: check + runs-on: ubuntu-latest + if: ${{ startsWith(github.ref, 'refs/tags/') }} - - name: Build - run: ./gradlew check + steps: + - name: Checkout sources + uses: actions/checkout@v4 + - name: Setup Java + uses: actions/setup-java@v4 + with: + distribution: "temurin" + java-version: 17 + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + - name: Run Publish + run: ./gradlew publish + env: + ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USERNAME }} + ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }} + ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_KEY }} + ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_KEY_PASSWORD }} + ORG_GRADLE_PROJECT_githubPackagesUsername: ${{ github.actor }} + ORG_GRADLE_PROJECT_githubPackagesPassword: ${{ secrets.GITHUB_TOKEN }} + - name: Extract release notes + uses: ffurrer2/extract-release-notes@v2 + with: + release_notes_file: RELEASE_NOTES.md + - name: Create GitHub Release + uses: softprops/action-gh-release@v2 + with: + body_path: RELEASE_NOTES.md diff --git a/docs/changelog.md b/CHANGELOG.md similarity index 76% rename from docs/changelog.md rename to CHANGELOG.md index 069b194a..9d551e70 100644 --- a/docs/changelog.md +++ b/CHANGELOG.md @@ -1,76 +1,80 @@ -# Changelog - -## 0.9.0 -### Изменения -* Переименованы модули. -* Gradle обновлен до 8.7 -* compileSdk и targetSdk повышены до 34 -* Добавлена возможность открыть DebugPanel без FragmentManager -* Добавлена поддержка Jetpack Compose -* accounts-plugin переведен на Jetpack Compose -* app-settings-plugin переведен на Jetpack Compose -* flipper-plugin переведен на Jetpack Compose -* servers-plugin переведен на Jetpack Compose -* **Breaking changes:** Изменены Maven-координаты библиотек. Наименования пакетов во всех модулях приведены к общему виду. См. [гайд по миграции][migration-guide]. -* **Breaking changes:** Удален плагин Variable. Вместо него используйте плагин Konfeature. См. [гайд по миграции][migration-guide]. - -## 0.8.1 -### Изменения -* Исправлен краш при остановке активити (#13) - -## 0.8.0 -### Изменения -* Исправлен краш на SDK 34 (#7) -* Исправлен краш при доступе к БД (#5) -* Обновлены зависимости: - * Kotlin 1.6.20 → 1.9.23 - * Room 2.4.0 → 2.6.1 - * KotlinX Coroutines 1.3.9 → 1.8.0 -* Удалено использование синтетиков -* Обновлено окружение сборки проекта - -## 0.7.5 -### Изменения -* Добавлена поддержка строк для плагина Flipper. -Теперь их можно указывать в качестве изменяемых значений. - -## 0.7.4 -### Изменения -* Добавлена конфигурация для публикации в публичный Maven -* Проект переведен на Gradle Kotlin DSL - -## 0.7.3 -### Изменения - -* Исправлена ошибка с отсутствием события изменения сервера. -* Метод observeEvents в DebugPanel возвращает не nullable Flow - -## 0.7.2 -### Изменения -* Добавил группирование для групп тоглов (без под групп). -Добавил возможность добавлять источники в рантайме Добавил возможность выбирать между источниками в рантайме. -Изменения в поведении: теперь в изменеённых тоглах будут приходить состояния всех тоглов, а не только имзененных - -* Добавлен плагин для быстрой подмены переменных в проекте VariablePlugin - -## 0.6.9 -### Изменения -Исправлены ошибки в работе `flipper-plugin` для релизной сборки - -## 0.6.8 -### Изменения -Добавлен [flipper-plugin](../plugins/flipper-plugin) для удобной работы с библиотекой [Flipper](https://github.com/RedMadRobot/flipper) - -## 0.6.7 -### Изменения -* Полностью удален Rx из зависимостей. -* Удален Groupie. Для списков используется [itemsAdapter](https://github.com/RedMadRobot/itemsadapter) -* Kotlin обновлен до 1.5.21. -* Android Gradle plugin обновлен до 4.2.0. -* Изменен способ удаления добавленных вручную элементов. -* Немного доработана цветовая тема библиотеки. -* Добавлена поддержка **viewbinding**. -* Исправлена проблема с задвоением логов при использовании Timber. -* Исправлены мелкие баги. - -[migration-guide]: migration_guide.md \ No newline at end of file +## [Unreleased] + +### Changed + +- no changes + +## 0.9.0 +### Изменения +* Переименованы модули. +* Gradle обновлен до 8.7 +* compileSdk и targetSdk повышены до 34 +* Добавлена возможность открыть DebugPanel без FragmentManager +* Добавлена поддержка Jetpack Compose +* accounts-plugin переведен на Jetpack Compose +* app-settings-plugin переведен на Jetpack Compose +* flipper-plugin переведен на Jetpack Compose +* servers-plugin переведен на Jetpack Compose +* **Breaking changes:** Изменены Maven-координаты библиотек. Наименования пакетов во всех модулях приведены к общему виду. См. [гайд по миграции][docs\migration-guide]. +* **Breaking changes:** Удален плагин Variable. Вместо него используйте плагин Konfeature. См. [гайд по миграции][docs\migration-guide]. + +## 0.8.1 +### Изменения +* Исправлен краш при остановке активити (#13) + +## 0.8.0 +### Изменения +* Исправлен краш на SDK 34 (#7) +* Исправлен краш при доступе к БД (#5) +* Обновлены зависимости: + * Kotlin 1.6.20 → 1.9.23 + * Room 2.4.0 → 2.6.1 + * KotlinX Coroutines 1.3.9 → 1.8.0 +* Удалено использование синтетиков +* Обновлено окружение сборки проекта + +## 0.7.5 +### Изменения +* Добавлена поддержка строк для плагина Flipper. + Теперь их можно указывать в качестве изменяемых значений. + +## 0.7.4 +### Изменения +* Добавлена конфигурация для публикации в публичный Maven +* Проект переведен на Gradle Kotlin DSL + +## 0.7.3 +### Изменения + +* Исправлена ошибка с отсутствием события изменения сервера. +* Метод observeEvents в DebugPanel возвращает не nullable Flow + +## 0.7.2 +### Изменения +* Добавил группирование для групп тоглов (без под групп). + Добавил возможность добавлять источники в рантайме Добавил возможность выбирать между источниками в рантайме. + Изменения в поведении: теперь в изменеённых тоглах будут приходить состояния всех тоглов, а не только имзененных + +* Добавлен плагин для быстрой подмены переменных в проекте VariablePlugin + +## 0.6.9 +### Изменения +Исправлены ошибки в работе `flipper-plugin` для релизной сборки + +## 0.6.8 +### Изменения +Добавлен [flipper-plugin](../plugins/flipper-plugin) для удобной работы с библиотекой [Flipper](https://github.com/RedMadRobot/flipper) + +## 0.6.7 +### Изменения +* Полностью удален Rx из зависимостей. +* Удален Groupie. Для списков используется [itemsAdapter](https://github.com/RedMadRobot/itemsadapter) +* Kotlin обновлен до 1.5.21. +* Android Gradle plugin обновлен до 4.2.0. +* Изменен способ удаления добавленных вручную элементов. +* Немного доработана цветовая тема библиотеки. +* Добавлена поддержка **viewbinding**. +* Исправлена проблема с задвоением логов при использовании Timber. +* Исправлены мелкие баги. + +[migration-guide]: migration_guide.md diff --git a/build.gradle.kts b/build.gradle.kts index 0fea89a4..08473216 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,4 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -plugins { - id("io.github.gradle-nexus.publish-plugin") version "2.0.0" -} subprojects { tasks.withType().configureEach { @@ -11,17 +8,6 @@ subprojects { } } -nexusPublishing { - // Uncomment if you need to release artifacts uploaded using "publish" task. - // repositoryDescription.set("Implicitly created (auto staging).") - repositories { - sonatype { - nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/")) - snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")) - } - } -} - tasks.register("clean", Delete::class) { delete(rootProject.layout.buildDirectory) } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index feb11370..d85a2e05 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -4,12 +4,22 @@ plugins { group = "com.redmadrobot.build" -repositories { - google() - mavenCentral() + +tasks.withType { + kotlinOptions.jvmTarget = JavaVersion.VERSION_11.toString() +} + +java { + targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_11 } dependencies { - implementation(kotlin("gradle-plugin", version = "1.9.23")) - implementation("com.android.tools.build:gradle:8.3.2") + implementation(libs.infrastructure.publish) + implementation(libs.infrastructure.android) + implementation(libs.publish.gradlePlugin) + implementation(libs.gradle.android.cacheFixGradlePlugin) + implementation(libs.kotlin.gradlePlugin) + implementation(libs.detekt.gradlePlugin) + implementation(libs.android.gradlePlugin) } diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts new file mode 100644 index 00000000..b2f9d99e --- /dev/null +++ b/buildSrc/settings.gradle.kts @@ -0,0 +1,37 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google { + content { + includeGroupAndSubgroups("com.android") + includeGroupAndSubgroups("com.google") + includeGroupAndSubgroups("androidx") + } + } + mavenCentral() + } +} + +@Suppress("UnstableApiUsage") +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + + repositories { + google { + content { + includeGroupAndSubgroups("com.android") + includeGroupAndSubgroups("com.google") + includeGroupAndSubgroups("androidx") + } + } + + mavenCentral() + gradlePluginPortal() + } + + versionCatalogs { + create("libs") { + from(files("../gradle/libs.versions.toml")) + } + } +} diff --git a/buildSrc/src/main/kotlin/convention-publish.gradle.kts b/buildSrc/src/main/kotlin/convention-publish.gradle.kts index 69463ea8..2e409c29 100644 --- a/buildSrc/src/main/kotlin/convention-publish.gradle.kts +++ b/buildSrc/src/main/kotlin/convention-publish.gradle.kts @@ -1,95 +1,51 @@ -import internal.android -import java.util.Properties +import com.redmadrobot.build.dsl.* +import com.vanniktech.maven.publish.SonatypeHost plugins { - id("maven-publish") - id("signing") + id("com.vanniktech.maven.publish") } -android { - publishing { - singleVariant("release") { - withSourcesJar() - } - } -} - -private val publishProperties by lazy { - rootProject.file("gradle/publish.properties").inputStream() - .use { Properties().apply { load(it) } } -} -val libraryName by lazy { - val properties = project.file("library.properties").inputStream() - .use { Properties().apply { load(it) } } - properties.getProperty("lib_name") -} - -publishing { - publications.create("release") { - artifactId = libraryName +mavenPublishing { + publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, automaticRelease = true) + signAllPublications() - afterEvaluate { from(components["release"]) } + pom { + name.convention(project.name) + description.convention(project.description) - pom { - name = libraryName - description = provider { project.description } - url = publishProperties.getProperty("home_page") + licenses { + mit() + } - licenses { - license { - name = publishProperties.getProperty("license_name") - url = publishProperties.getProperty("license_url") - } + developers { + developer { + id = "Zestxx" + name = "Roman Choriev" + email = "r.choryev@redmadrobot.com" } + } - developers { - developer { - id = "Zestxx" - name = "Roman Choriev" - email = "r.choryev@redmadrobot.com" - } + contributors { + contributor { + name = "Osip Fatkullin" + email = "o.fatkullin@redmadrobot.com" } - - contributors { - contributor { - name = "Osip Fatkullin" - email = "o.fatkullin@redmadrobot.com" - } - contributor { - name = "Alexandr Anisimov" - email = "PilotOfSparrow@gmail.com" - } - contributor { - name = "Dmitry trabo" - email = "dtrabo@gmail.com" - } + contributor { + name = "Alexandr Anisimov" + email = "PilotOfSparrow@gmail.com" } - - scm { - connection = "scm:git:git://github.com/RedMadRobot/debug-panel-android.git" - developerConnection = "scm:git:ssh://github.com/RedMadRobot/debug-panel-android.git" - url = publishProperties.getProperty("home_page") + contributor { + name = "Dmitry trabo" + email = "dtrabo@gmail.com" } } - } - - repositories { - mavenLocal() - maven { - name = "OSSRH" - url = project.uri(publishProperties.getProperty("sonatype_repo")) - credentials { - username = System.getenv("OSSRH_USER") - password = System.getenv("OSSRH_PASSWORD") - } - } + setGitHubProject("RedMadRobot/debug-panel-android") } } -afterEvaluate { - signing { - useGpgCmd() - sign(publishing.publications["release"]) +publishing { + repositories { + if (isRunningOnCi) githubPackages("RedMadRobot/debug-panel-android") } } diff --git a/common/library.properties b/common/library.properties deleted file mode 100644 index c3169e91..00000000 --- a/common/library.properties +++ /dev/null @@ -1,3 +0,0 @@ -lib_name=panel-common -lib_vcs=https://github.com/RedMadRobot/debug-panel-android.git -lib_issue_tracker=https://github.com/RedMadRobot/debug-panel-android/issues diff --git a/core/library.properties b/core/library.properties deleted file mode 100644 index 9e918db7..00000000 --- a/core/library.properties +++ /dev/null @@ -1,3 +0,0 @@ -lib_name=panel-core -lib_vcs=https://github.com/RedMadRobot/debug-panel-android.git -lib_issue_tracker=https://github.com/RedMadRobot/debug-panel-android/issues diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0b520a20..c5a5f09d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,30 @@ +# For an example of how to maintain dependencies in version catalogs, +# see https://github.com/RedMadRobot/gradle-version-catalogs. [versions] +activity = "1.9.0" +android-gradle-plugin = "8.4.2" +detekt = "1.23.6" +gradle-android-cacheFix = "3.0.1" +gradle-infrastructure = "0.18.1" +kotlin = "1.9.23" +versionsPlugin = "0.51.0" +publish-plugin = "0.28.0" +poko = "0.16.0" +kotest = "5.9.1" konfeature = "0.1.0" [libraries] +android-gradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "android-gradle-plugin" } +detekt-gradlePlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" } +gradle-android-cacheFixGradlePlugin = { module = "gradle.plugin.org.gradle.android:android-cache-fix-gradle-plugin", version.ref = "gradle-android-cacheFix" } +infrastructure-android = { module = "com.redmadrobot.build:infrastructure-android", version.ref = "gradle-infrastructure" } +infrastructure-publish = { module = "com.redmadrobot.build:infrastructure-publish", version.ref = "gradle-infrastructure" } +publish-gradlePlugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "publish-plugin" } +kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } +kotest-assertions-core = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" } konfeature = { module = "com.redmadrobot.konfeature:konfeature", version.ref = "konfeature" } + +[plugins] +infrastructure-detekt = { id = "com.redmadrobot.detekt", version.ref = "gradle-infrastructure" } +versions = { id = "com.github.ben-manes.versions", version.ref = "versionsPlugin" } +poko = { id = "dev.drewhamilton.poko", version.ref = "poko" } diff --git a/no-op/library.properties b/no-op/library.properties deleted file mode 100644 index 04892a17..00000000 --- a/no-op/library.properties +++ /dev/null @@ -1,3 +0,0 @@ -lib_name=panel-no-op -lib_vcs=https://github.com/RedMadRobot/debug-panel-android.git -lib_issue_tracker=https://github.com/RedMadRobot/debug-panel-android/issues diff --git a/common/.gitignore b/panel-common/.gitignore similarity index 100% rename from common/.gitignore rename to panel-common/.gitignore diff --git a/common/build.gradle.kts b/panel-common/build.gradle.kts similarity index 100% rename from common/build.gradle.kts rename to panel-common/build.gradle.kts diff --git a/common/consumer-rules.pro b/panel-common/consumer-rules.pro similarity index 100% rename from common/consumer-rules.pro rename to panel-common/consumer-rules.pro diff --git a/common/proguard-rules.pro b/panel-common/proguard-rules.pro similarity index 100% rename from common/proguard-rules.pro rename to panel-common/proguard-rules.pro diff --git a/core/.gitignore b/panel-core/.gitignore similarity index 100% rename from core/.gitignore rename to panel-core/.gitignore diff --git a/core/build.gradle.kts b/panel-core/build.gradle.kts similarity index 96% rename from core/build.gradle.kts rename to panel-core/build.gradle.kts index 94507062..91ce8cc4 100644 --- a/core/build.gradle.kts +++ b/panel-core/build.gradle.kts @@ -52,6 +52,6 @@ kotlin { } dependencies { - implementation(project(":common")) + implementation(project(":panel-common")) kapt(androidx.room.compiler) } diff --git a/core/consumer-rules.pro b/panel-core/consumer-rules.pro similarity index 100% rename from core/consumer-rules.pro rename to panel-core/consumer-rules.pro diff --git a/core/proguard-rules.pro b/panel-core/proguard-rules.pro similarity index 100% rename from core/proguard-rules.pro rename to panel-core/proguard-rules.pro diff --git a/core/src/main/AndroidManifest.xml b/panel-core/src/main/AndroidManifest.xml similarity index 100% rename from core/src/main/AndroidManifest.xml rename to panel-core/src/main/AndroidManifest.xml diff --git a/core/src/main/kotlin/com/redmadrobot/debug/core/DebugEvent.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/DebugEvent.kt similarity index 100% rename from core/src/main/kotlin/com/redmadrobot/debug/core/DebugEvent.kt rename to panel-core/src/main/kotlin/com/redmadrobot/debug/core/DebugEvent.kt diff --git a/core/src/main/kotlin/com/redmadrobot/debug/core/DebugPanel.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/DebugPanel.kt similarity index 100% rename from core/src/main/kotlin/com/redmadrobot/debug/core/DebugPanel.kt rename to panel-core/src/main/kotlin/com/redmadrobot/debug/core/DebugPanel.kt diff --git a/core/src/main/kotlin/com/redmadrobot/debug/core/DebugPanelConfig.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/DebugPanelConfig.kt similarity index 100% rename from core/src/main/kotlin/com/redmadrobot/debug/core/DebugPanelConfig.kt rename to panel-core/src/main/kotlin/com/redmadrobot/debug/core/DebugPanelConfig.kt diff --git a/core/src/main/kotlin/com/redmadrobot/debug/core/DebugPanelInstance.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/DebugPanelInstance.kt similarity index 100% rename from core/src/main/kotlin/com/redmadrobot/debug/core/DebugPanelInstance.kt rename to panel-core/src/main/kotlin/com/redmadrobot/debug/core/DebugPanelInstance.kt diff --git a/core/src/main/kotlin/com/redmadrobot/debug/core/annotation/DebugPanelInternal.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/annotation/DebugPanelInternal.kt similarity index 100% rename from core/src/main/kotlin/com/redmadrobot/debug/core/annotation/DebugPanelInternal.kt rename to panel-core/src/main/kotlin/com/redmadrobot/debug/core/annotation/DebugPanelInternal.kt diff --git a/core/src/main/kotlin/com/redmadrobot/debug/core/data/DebugDataProvider.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/data/DebugDataProvider.kt similarity index 100% rename from core/src/main/kotlin/com/redmadrobot/debug/core/data/DebugDataProvider.kt rename to panel-core/src/main/kotlin/com/redmadrobot/debug/core/data/DebugDataProvider.kt diff --git a/core/src/main/kotlin/com/redmadrobot/debug/core/extension/ComposeExt.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/extension/ComposeExt.kt similarity index 100% rename from core/src/main/kotlin/com/redmadrobot/debug/core/extension/ComposeExt.kt rename to panel-core/src/main/kotlin/com/redmadrobot/debug/core/extension/ComposeExt.kt diff --git a/core/src/main/kotlin/com/redmadrobot/debug/core/extension/CoroutinesExtension.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/extension/CoroutinesExtension.kt similarity index 100% rename from core/src/main/kotlin/com/redmadrobot/debug/core/extension/CoroutinesExtension.kt rename to panel-core/src/main/kotlin/com/redmadrobot/debug/core/extension/CoroutinesExtension.kt diff --git a/core/src/main/kotlin/com/redmadrobot/debug/core/extension/LifecicleExt.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/extension/LifecicleExt.kt similarity index 100% rename from core/src/main/kotlin/com/redmadrobot/debug/core/extension/LifecicleExt.kt rename to panel-core/src/main/kotlin/com/redmadrobot/debug/core/extension/LifecicleExt.kt diff --git a/core/src/main/kotlin/com/redmadrobot/debug/core/extension/PluginsExt.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/extension/PluginsExt.kt similarity index 100% rename from core/src/main/kotlin/com/redmadrobot/debug/core/extension/PluginsExt.kt rename to panel-core/src/main/kotlin/com/redmadrobot/debug/core/extension/PluginsExt.kt diff --git a/core/src/main/kotlin/com/redmadrobot/debug/core/inapp/compose/DebugBottomSheet.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/inapp/compose/DebugBottomSheet.kt similarity index 100% rename from core/src/main/kotlin/com/redmadrobot/debug/core/inapp/compose/DebugBottomSheet.kt rename to panel-core/src/main/kotlin/com/redmadrobot/debug/core/inapp/compose/DebugBottomSheet.kt diff --git a/core/src/main/kotlin/com/redmadrobot/debug/core/inapp/shake/ShakeController.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/inapp/shake/ShakeController.kt similarity index 100% rename from core/src/main/kotlin/com/redmadrobot/debug/core/inapp/shake/ShakeController.kt rename to panel-core/src/main/kotlin/com/redmadrobot/debug/core/inapp/shake/ShakeController.kt diff --git a/core/src/main/kotlin/com/redmadrobot/debug/core/inapp/shake/ShakeListener.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/inapp/shake/ShakeListener.kt similarity index 100% rename from core/src/main/kotlin/com/redmadrobot/debug/core/inapp/shake/ShakeListener.kt rename to panel-core/src/main/kotlin/com/redmadrobot/debug/core/inapp/shake/ShakeListener.kt diff --git a/core/src/main/kotlin/com/redmadrobot/debug/core/internal/CommonContainer.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/internal/CommonContainer.kt similarity index 100% rename from core/src/main/kotlin/com/redmadrobot/debug/core/internal/CommonContainer.kt rename to panel-core/src/main/kotlin/com/redmadrobot/debug/core/internal/CommonContainer.kt diff --git a/core/src/main/kotlin/com/redmadrobot/debug/core/internal/EditablePlugin.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/internal/EditablePlugin.kt similarity index 100% rename from core/src/main/kotlin/com/redmadrobot/debug/core/internal/EditablePlugin.kt rename to panel-core/src/main/kotlin/com/redmadrobot/debug/core/internal/EditablePlugin.kt diff --git a/core/src/main/kotlin/com/redmadrobot/debug/core/internal/PluginDependencyContainer.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/internal/PluginDependencyContainer.kt similarity index 100% rename from core/src/main/kotlin/com/redmadrobot/debug/core/internal/PluginDependencyContainer.kt rename to panel-core/src/main/kotlin/com/redmadrobot/debug/core/internal/PluginDependencyContainer.kt diff --git a/core/src/main/kotlin/com/redmadrobot/debug/core/internal/PluginViewModel.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/internal/PluginViewModel.kt similarity index 100% rename from core/src/main/kotlin/com/redmadrobot/debug/core/internal/PluginViewModel.kt rename to panel-core/src/main/kotlin/com/redmadrobot/debug/core/internal/PluginViewModel.kt diff --git a/core/src/main/kotlin/com/redmadrobot/debug/core/plugin/Plugin.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/plugin/Plugin.kt similarity index 100% rename from core/src/main/kotlin/com/redmadrobot/debug/core/plugin/Plugin.kt rename to panel-core/src/main/kotlin/com/redmadrobot/debug/core/plugin/Plugin.kt diff --git a/core/src/main/kotlin/com/redmadrobot/debug/core/plugin/PluginManager.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/plugin/PluginManager.kt similarity index 100% rename from core/src/main/kotlin/com/redmadrobot/debug/core/plugin/PluginManager.kt rename to panel-core/src/main/kotlin/com/redmadrobot/debug/core/plugin/PluginManager.kt diff --git a/core/src/main/kotlin/com/redmadrobot/debug/core/ui/debugpanel/DebugBottomSheetActivity.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/ui/debugpanel/DebugBottomSheetActivity.kt similarity index 100% rename from core/src/main/kotlin/com/redmadrobot/debug/core/ui/debugpanel/DebugBottomSheetActivity.kt rename to panel-core/src/main/kotlin/com/redmadrobot/debug/core/ui/debugpanel/DebugBottomSheetActivity.kt diff --git a/core/src/main/kotlin/com/redmadrobot/debug/core/ui/settings/DebugSettingsActivity.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/ui/settings/DebugSettingsActivity.kt similarity index 100% rename from core/src/main/kotlin/com/redmadrobot/debug/core/ui/settings/DebugSettingsActivity.kt rename to panel-core/src/main/kotlin/com/redmadrobot/debug/core/ui/settings/DebugSettingsActivity.kt diff --git a/core/src/main/kotlin/com/redmadrobot/debug/core/ui/settings/DebugSettingsNavHost.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/ui/settings/DebugSettingsNavHost.kt similarity index 100% rename from core/src/main/kotlin/com/redmadrobot/debug/core/ui/settings/DebugSettingsNavHost.kt rename to panel-core/src/main/kotlin/com/redmadrobot/debug/core/ui/settings/DebugSettingsNavHost.kt diff --git a/core/src/main/kotlin/com/redmadrobot/debug/core/ui/settings/DebugSettingsScreen.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/ui/settings/DebugSettingsScreen.kt similarity index 100% rename from core/src/main/kotlin/com/redmadrobot/debug/core/ui/settings/DebugSettingsScreen.kt rename to panel-core/src/main/kotlin/com/redmadrobot/debug/core/ui/settings/DebugSettingsScreen.kt diff --git a/core/src/main/kotlin/com/redmadrobot/debug/core/ui/settings/PluginSettingsItem.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/ui/settings/PluginSettingsItem.kt similarity index 100% rename from core/src/main/kotlin/com/redmadrobot/debug/core/ui/settings/PluginSettingsItem.kt rename to panel-core/src/main/kotlin/com/redmadrobot/debug/core/ui/settings/PluginSettingsItem.kt diff --git a/core/src/main/kotlin/com/redmadrobot/debug/core/util/ActivityLifecycleCallbacksAdapter.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/util/ActivityLifecycleCallbacksAdapter.kt similarity index 100% rename from core/src/main/kotlin/com/redmadrobot/debug/core/util/ActivityLifecycleCallbacksAdapter.kt rename to panel-core/src/main/kotlin/com/redmadrobot/debug/core/util/ActivityLifecycleCallbacksAdapter.kt diff --git a/core/src/main/kotlin/com/redmadrobot/debug/core/util/ApplicationLifecycleHandler.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/util/ApplicationLifecycleHandler.kt similarity index 100% rename from core/src/main/kotlin/com/redmadrobot/debug/core/util/ApplicationLifecycleHandler.kt rename to panel-core/src/main/kotlin/com/redmadrobot/debug/core/util/ApplicationLifecycleHandler.kt diff --git a/core/src/main/kotlin/com/redmadrobot/debug/core/util/DebugPanelBroadcastReceiver.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/util/DebugPanelBroadcastReceiver.kt similarity index 100% rename from core/src/main/kotlin/com/redmadrobot/debug/core/util/DebugPanelBroadcastReceiver.kt rename to panel-core/src/main/kotlin/com/redmadrobot/debug/core/util/DebugPanelBroadcastReceiver.kt diff --git a/core/src/main/kotlin/com/redmadrobot/debug/core/util/DebugPanelNotification.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/util/DebugPanelNotification.kt similarity index 100% rename from core/src/main/kotlin/com/redmadrobot/debug/core/util/DebugPanelNotification.kt rename to panel-core/src/main/kotlin/com/redmadrobot/debug/core/util/DebugPanelNotification.kt diff --git a/core/src/main/res/drawable/ic_debug_notification.xml b/panel-core/src/main/res/drawable/ic_debug_notification.xml similarity index 100% rename from core/src/main/res/drawable/ic_debug_notification.xml rename to panel-core/src/main/res/drawable/ic_debug_notification.xml diff --git a/core/src/main/res/drawable/ic_debug_panel.xml b/panel-core/src/main/res/drawable/ic_debug_panel.xml similarity index 100% rename from core/src/main/res/drawable/ic_debug_panel.xml rename to panel-core/src/main/res/drawable/ic_debug_panel.xml diff --git a/core/src/main/res/drawable/ic_settings_notification_action.xml b/panel-core/src/main/res/drawable/ic_settings_notification_action.xml similarity index 100% rename from core/src/main/res/drawable/ic_settings_notification_action.xml rename to panel-core/src/main/res/drawable/ic_settings_notification_action.xml diff --git a/core/src/main/res/drawable/shape_scrollable_sheet.xml b/panel-core/src/main/res/drawable/shape_scrollable_sheet.xml similarity index 100% rename from core/src/main/res/drawable/shape_scrollable_sheet.xml rename to panel-core/src/main/res/drawable/shape_scrollable_sheet.xml diff --git a/core/src/main/res/values/colors.xml b/panel-core/src/main/res/values/colors.xml similarity index 100% rename from core/src/main/res/values/colors.xml rename to panel-core/src/main/res/values/colors.xml diff --git a/core/src/main/res/values/dimens.xml b/panel-core/src/main/res/values/dimens.xml similarity index 100% rename from core/src/main/res/values/dimens.xml rename to panel-core/src/main/res/values/dimens.xml diff --git a/core/src/main/res/values/public.xml b/panel-core/src/main/res/values/public.xml similarity index 100% rename from core/src/main/res/values/public.xml rename to panel-core/src/main/res/values/public.xml diff --git a/core/src/main/res/values/strings.xml b/panel-core/src/main/res/values/strings.xml similarity index 100% rename from core/src/main/res/values/strings.xml rename to panel-core/src/main/res/values/strings.xml diff --git a/core/src/main/res/values/styles.xml b/panel-core/src/main/res/values/styles.xml similarity index 100% rename from core/src/main/res/values/styles.xml rename to panel-core/src/main/res/values/styles.xml diff --git a/no-op/.gitignore b/panel-no-op/.gitignore similarity index 100% rename from no-op/.gitignore rename to panel-no-op/.gitignore diff --git a/no-op/build.gradle.kts b/panel-no-op/build.gradle.kts similarity index 100% rename from no-op/build.gradle.kts rename to panel-no-op/build.gradle.kts diff --git a/no-op/consumer-rules.pro b/panel-no-op/consumer-rules.pro similarity index 100% rename from no-op/consumer-rules.pro rename to panel-no-op/consumer-rules.pro diff --git a/no-op/proguard-rules.pro b/panel-no-op/proguard-rules.pro similarity index 100% rename from no-op/proguard-rules.pro rename to panel-no-op/proguard-rules.pro diff --git a/no-op/src/main/kotlin/com/redmadrobot/debug/noop/DebugDataProvider.kt b/panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/DebugDataProvider.kt similarity index 100% rename from no-op/src/main/kotlin/com/redmadrobot/debug/noop/DebugDataProvider.kt rename to panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/DebugDataProvider.kt diff --git a/no-op/src/main/kotlin/com/redmadrobot/debug/noop/core/DebugEvent.kt b/panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/core/DebugEvent.kt similarity index 100% rename from no-op/src/main/kotlin/com/redmadrobot/debug/noop/core/DebugEvent.kt rename to panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/core/DebugEvent.kt diff --git a/no-op/src/main/kotlin/com/redmadrobot/debug/noop/core/DebugPanel.kt b/panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/core/DebugPanel.kt similarity index 100% rename from no-op/src/main/kotlin/com/redmadrobot/debug/noop/core/DebugPanel.kt rename to panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/core/DebugPanel.kt diff --git a/no-op/src/main/kotlin/com/redmadrobot/debug/noop/core/DebugPanelConfig.kt b/panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/core/DebugPanelConfig.kt similarity index 100% rename from no-op/src/main/kotlin/com/redmadrobot/debug/noop/core/DebugPanelConfig.kt rename to panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/core/DebugPanelConfig.kt diff --git a/no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/accounts/AccountSelectedEvent.kt b/panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/accounts/AccountSelectedEvent.kt similarity index 100% rename from no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/accounts/AccountSelectedEvent.kt rename to panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/accounts/AccountSelectedEvent.kt diff --git a/no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/accounts/AccountsPlugin.kt b/panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/accounts/AccountsPlugin.kt similarity index 100% rename from no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/accounts/AccountsPlugin.kt rename to panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/accounts/AccountsPlugin.kt diff --git a/no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/accounts/DebugAccount.kt b/panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/accounts/DebugAccount.kt similarity index 100% rename from no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/accounts/DebugAccount.kt rename to panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/accounts/DebugAccount.kt diff --git a/no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/accounts/DebugAuthenticator.kt b/panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/accounts/DebugAuthenticator.kt similarity index 100% rename from no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/accounts/DebugAuthenticator.kt rename to panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/accounts/DebugAuthenticator.kt diff --git a/no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/appsettings/AppSettingsPlugin.kt b/panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/appsettings/AppSettingsPlugin.kt similarity index 100% rename from no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/appsettings/AppSettingsPlugin.kt rename to panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/appsettings/AppSettingsPlugin.kt diff --git a/no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/flipper/FlipperPlugin.kt b/panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/flipper/FlipperPlugin.kt similarity index 100% rename from no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/flipper/FlipperPlugin.kt rename to panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/flipper/FlipperPlugin.kt diff --git a/no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/konfeature/KonfeatureDebugPanelInterceptor.kt b/panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/konfeature/KonfeatureDebugPanelInterceptor.kt similarity index 100% rename from no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/konfeature/KonfeatureDebugPanelInterceptor.kt rename to panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/konfeature/KonfeatureDebugPanelInterceptor.kt diff --git a/no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/konfeature/KonfeaturePlugin.kt b/panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/konfeature/KonfeaturePlugin.kt similarity index 100% rename from no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/konfeature/KonfeaturePlugin.kt rename to panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/konfeature/KonfeaturePlugin.kt diff --git a/no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/servers/DebugServer.kt b/panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/servers/DebugServer.kt similarity index 100% rename from no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/servers/DebugServer.kt rename to panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/servers/DebugServer.kt diff --git a/no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/servers/DebugStage.kt b/panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/servers/DebugStage.kt similarity index 100% rename from no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/servers/DebugStage.kt rename to panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/servers/DebugStage.kt diff --git a/no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/servers/ServerSelectedEvent.kt b/panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/servers/ServerSelectedEvent.kt similarity index 100% rename from no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/servers/ServerSelectedEvent.kt rename to panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/servers/ServerSelectedEvent.kt diff --git a/no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/servers/ServersPlugin.kt b/panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/servers/ServersPlugin.kt similarity index 100% rename from no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/servers/ServersPlugin.kt rename to panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/servers/ServersPlugin.kt diff --git a/no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/servers/interceptor/DebugServerInterceptor.kt b/panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/servers/interceptor/DebugServerInterceptor.kt similarity index 100% rename from no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/servers/interceptor/DebugServerInterceptor.kt rename to panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/servers/interceptor/DebugServerInterceptor.kt diff --git a/no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/servers/interceptor/DebugStageInterceptor.kt b/panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/servers/interceptor/DebugStageInterceptor.kt similarity index 100% rename from no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/servers/interceptor/DebugStageInterceptor.kt rename to panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/plugin/servers/interceptor/DebugStageInterceptor.kt diff --git a/plugins/accounts/library.properties b/plugins/accounts/library.properties deleted file mode 100644 index 3c1f7119..00000000 --- a/plugins/accounts/library.properties +++ /dev/null @@ -1,3 +0,0 @@ -lib_name = plugin-accounts -lib_vcs=https://github.com/RedMadRobot/debug-panel-android.git -lib_issue_tracker=https://github.com/RedMadRobot/debug-panel-android/issues diff --git a/plugins/app-settings/library.properties b/plugins/app-settings/library.properties deleted file mode 100644 index 0fd13565..00000000 --- a/plugins/app-settings/library.properties +++ /dev/null @@ -1,3 +0,0 @@ -lib_name = plugin-app-settings -lib_vcs=https://github.com/RedMadRobot/debug-panel-android.git -lib_issue_tracker=https://github.com/RedMadRobot/debug-panel-android/issues diff --git a/plugins/flipper/library.properties b/plugins/flipper/library.properties deleted file mode 100644 index d67a90a6..00000000 --- a/plugins/flipper/library.properties +++ /dev/null @@ -1,3 +0,0 @@ -lib_name = plugin-flipper -lib_vcs=https://github.com/RedMadRobot/debug-panel-android.git -lib_issue_tracker=https://github.com/RedMadRobot/debug-panel-android/issues diff --git a/plugins/konfeature/library.properties b/plugins/konfeature/library.properties deleted file mode 100644 index 35d2c9f3..00000000 --- a/plugins/konfeature/library.properties +++ /dev/null @@ -1,3 +0,0 @@ -lib_name = plugin-konfeature -lib_vcs=https://github.com/RedMadRobot/debug-panel-android.git -lib_issue_tracker=https://github.com/RedMadRobot/debug-panel-android/issues diff --git a/plugins/accounts/.gitignore b/plugins/plugin-accounts/.gitignore similarity index 100% rename from plugins/accounts/.gitignore rename to plugins/plugin-accounts/.gitignore diff --git a/plugins/accounts/build.gradle.kts b/plugins/plugin-accounts/build.gradle.kts similarity index 93% rename from plugins/accounts/build.gradle.kts rename to plugins/plugin-accounts/build.gradle.kts index a63aafc5..37b03e94 100644 --- a/plugins/accounts/build.gradle.kts +++ b/plugins/plugin-accounts/build.gradle.kts @@ -58,7 +58,7 @@ kotlin { dependencies { implementation(kotlin("stdlib")) - implementation(project(":core")) - implementation(project(":common")) + implementation(project(":panel-core")) + implementation(project(":panel-common")) kapt(androidx.room.compiler) } diff --git a/plugins/accounts/consumer-rules.pro b/plugins/plugin-accounts/consumer-rules.pro similarity index 100% rename from plugins/accounts/consumer-rules.pro rename to plugins/plugin-accounts/consumer-rules.pro diff --git a/plugins/accounts/proguard-rules.pro b/plugins/plugin-accounts/proguard-rules.pro similarity index 100% rename from plugins/accounts/proguard-rules.pro rename to plugins/plugin-accounts/proguard-rules.pro diff --git a/plugins/accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/AccountSelectedEvent.kt b/plugins/plugin-accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/AccountSelectedEvent.kt similarity index 100% rename from plugins/accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/AccountSelectedEvent.kt rename to plugins/plugin-accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/AccountSelectedEvent.kt diff --git a/plugins/accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/AccountsPlugin.kt b/plugins/plugin-accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/AccountsPlugin.kt similarity index 100% rename from plugins/accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/AccountsPlugin.kt rename to plugins/plugin-accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/AccountsPlugin.kt diff --git a/plugins/accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/AccountsPluginContainer.kt b/plugins/plugin-accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/AccountsPluginContainer.kt similarity index 100% rename from plugins/accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/AccountsPluginContainer.kt rename to plugins/plugin-accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/AccountsPluginContainer.kt diff --git a/plugins/accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/authenticator/DebugAuthenticator.kt b/plugins/plugin-accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/authenticator/DebugAuthenticator.kt similarity index 100% rename from plugins/accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/authenticator/DebugAuthenticator.kt rename to plugins/plugin-accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/authenticator/DebugAuthenticator.kt diff --git a/plugins/accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/authenticator/DefaultAuthenticator.kt b/plugins/plugin-accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/authenticator/DefaultAuthenticator.kt similarity index 100% rename from plugins/accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/authenticator/DefaultAuthenticator.kt rename to plugins/plugin-accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/authenticator/DefaultAuthenticator.kt diff --git a/plugins/accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/data/DebugAccountRepository.kt b/plugins/plugin-accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/data/DebugAccountRepository.kt similarity index 100% rename from plugins/accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/data/DebugAccountRepository.kt rename to plugins/plugin-accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/data/DebugAccountRepository.kt diff --git a/plugins/accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/data/LocalDebugAccountRepository.kt b/plugins/plugin-accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/data/LocalDebugAccountRepository.kt similarity index 100% rename from plugins/accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/data/LocalDebugAccountRepository.kt rename to plugins/plugin-accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/data/LocalDebugAccountRepository.kt diff --git a/plugins/accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/data/model/DebugAccount.kt b/plugins/plugin-accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/data/model/DebugAccount.kt similarity index 100% rename from plugins/accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/data/model/DebugAccount.kt rename to plugins/plugin-accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/data/model/DebugAccount.kt diff --git a/plugins/accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/data/storage/AccountsPluginDatabase.kt b/plugins/plugin-accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/data/storage/AccountsPluginDatabase.kt similarity index 100% rename from plugins/accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/data/storage/AccountsPluginDatabase.kt rename to plugins/plugin-accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/data/storage/AccountsPluginDatabase.kt diff --git a/plugins/accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/data/storage/DebugAccountDao.kt b/plugins/plugin-accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/data/storage/DebugAccountDao.kt similarity index 100% rename from plugins/accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/data/storage/DebugAccountDao.kt rename to plugins/plugin-accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/data/storage/DebugAccountDao.kt diff --git a/plugins/accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/ui/AccountsScreen.kt b/plugins/plugin-accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/ui/AccountsScreen.kt similarity index 100% rename from plugins/accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/ui/AccountsScreen.kt rename to plugins/plugin-accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/ui/AccountsScreen.kt diff --git a/plugins/accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/ui/AccountsViewModel.kt b/plugins/plugin-accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/ui/AccountsViewModel.kt similarity index 100% rename from plugins/accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/ui/AccountsViewModel.kt rename to plugins/plugin-accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/ui/AccountsViewModel.kt diff --git a/plugins/accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/ui/AccountsViewState.kt b/plugins/plugin-accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/ui/AccountsViewState.kt similarity index 100% rename from plugins/accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/ui/AccountsViewState.kt rename to plugins/plugin-accounts/src/main/kotlin/com/redmadrobot/debug/plugin/accounts/ui/AccountsViewState.kt diff --git a/plugins/accounts/src/main/res/drawable/icon_account.xml b/plugins/plugin-accounts/src/main/res/drawable/icon_account.xml similarity index 100% rename from plugins/accounts/src/main/res/drawable/icon_account.xml rename to plugins/plugin-accounts/src/main/res/drawable/icon_account.xml diff --git a/plugins/accounts/src/main/res/drawable/icon_add_account.xml b/plugins/plugin-accounts/src/main/res/drawable/icon_add_account.xml similarity index 100% rename from plugins/accounts/src/main/res/drawable/icon_add_account.xml rename to plugins/plugin-accounts/src/main/res/drawable/icon_add_account.xml diff --git a/plugins/accounts/src/main/res/drawable/icon_delete.xml b/plugins/plugin-accounts/src/main/res/drawable/icon_delete.xml similarity index 100% rename from plugins/accounts/src/main/res/drawable/icon_delete.xml rename to plugins/plugin-accounts/src/main/res/drawable/icon_delete.xml diff --git a/plugins/accounts/src/main/res/values/color.xml b/plugins/plugin-accounts/src/main/res/values/color.xml similarity index 100% rename from plugins/accounts/src/main/res/values/color.xml rename to plugins/plugin-accounts/src/main/res/values/color.xml diff --git a/plugins/accounts/src/main/res/values/public.xml b/plugins/plugin-accounts/src/main/res/values/public.xml similarity index 100% rename from plugins/accounts/src/main/res/values/public.xml rename to plugins/plugin-accounts/src/main/res/values/public.xml diff --git a/plugins/accounts/src/main/res/values/strings.xml b/plugins/plugin-accounts/src/main/res/values/strings.xml similarity index 100% rename from plugins/accounts/src/main/res/values/strings.xml rename to plugins/plugin-accounts/src/main/res/values/strings.xml diff --git a/plugins/app-settings/.gitignore b/plugins/plugin-app-settings/.gitignore similarity index 100% rename from plugins/app-settings/.gitignore rename to plugins/plugin-app-settings/.gitignore diff --git a/plugins/app-settings/build.gradle.kts b/plugins/plugin-app-settings/build.gradle.kts similarity index 93% rename from plugins/app-settings/build.gradle.kts rename to plugins/plugin-app-settings/build.gradle.kts index 01bb9174..44bc1e8b 100644 --- a/plugins/app-settings/build.gradle.kts +++ b/plugins/plugin-app-settings/build.gradle.kts @@ -51,8 +51,8 @@ kotlin { } dependencies { - implementation(project(":core")) - implementation(project(":common")) + implementation(project(":panel-core")) + implementation(project(":panel-common")) implementation(kotlin("stdlib")) kapt(androidx.room.compiler) } diff --git a/plugins/app-settings/consumer-rules.pro b/plugins/plugin-app-settings/consumer-rules.pro similarity index 100% rename from plugins/app-settings/consumer-rules.pro rename to plugins/plugin-app-settings/consumer-rules.pro diff --git a/plugins/app-settings/proguard-rules.pro b/plugins/plugin-app-settings/proguard-rules.pro similarity index 100% rename from plugins/app-settings/proguard-rules.pro rename to plugins/plugin-app-settings/proguard-rules.pro diff --git a/plugins/app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/AppSettingsPlugin.kt b/plugins/plugin-app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/AppSettingsPlugin.kt similarity index 100% rename from plugins/app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/AppSettingsPlugin.kt rename to plugins/plugin-app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/AppSettingsPlugin.kt diff --git a/plugins/app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/AppSettingsPluginContainer.kt b/plugins/plugin-app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/AppSettingsPluginContainer.kt similarity index 100% rename from plugins/app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/AppSettingsPluginContainer.kt rename to plugins/plugin-app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/AppSettingsPluginContainer.kt diff --git a/plugins/app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/data/AppSettingsRepository.kt b/plugins/plugin-app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/data/AppSettingsRepository.kt similarity index 100% rename from plugins/app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/data/AppSettingsRepository.kt rename to plugins/plugin-app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/data/AppSettingsRepository.kt diff --git a/plugins/app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/data/AppSettingsRepositoryImpl.kt b/plugins/plugin-app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/data/AppSettingsRepositoryImpl.kt similarity index 100% rename from plugins/app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/data/AppSettingsRepositoryImpl.kt rename to plugins/plugin-app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/data/AppSettingsRepositoryImpl.kt diff --git a/plugins/app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/data/DefaultSharedPreferences.kt b/plugins/plugin-app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/data/DefaultSharedPreferences.kt similarity index 100% rename from plugins/app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/data/DefaultSharedPreferences.kt rename to plugins/plugin-app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/data/DefaultSharedPreferences.kt diff --git a/plugins/app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/ui/ApplicationSettingsScreen.kt b/plugins/plugin-app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/ui/ApplicationSettingsScreen.kt similarity index 100% rename from plugins/app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/ui/ApplicationSettingsScreen.kt rename to plugins/plugin-app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/ui/ApplicationSettingsScreen.kt diff --git a/plugins/app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/ui/ApplicationSettingsViewModel.kt b/plugins/plugin-app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/ui/ApplicationSettingsViewModel.kt similarity index 100% rename from plugins/app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/ui/ApplicationSettingsViewModel.kt rename to plugins/plugin-app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/ui/ApplicationSettingsViewModel.kt diff --git a/plugins/app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/ui/SettingItemUiModel.kt b/plugins/plugin-app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/ui/SettingItemUiModel.kt similarity index 100% rename from plugins/app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/ui/SettingItemUiModel.kt rename to plugins/plugin-app-settings/src/main/kotlin/com/redmadrobot/debug/plugin/appsettings/ui/SettingItemUiModel.kt diff --git a/plugins/app-settings/src/main/res/values/public.xml b/plugins/plugin-app-settings/src/main/res/values/public.xml similarity index 100% rename from plugins/app-settings/src/main/res/values/public.xml rename to plugins/plugin-app-settings/src/main/res/values/public.xml diff --git a/plugins/app-settings/src/main/res/values/strings.xml b/plugins/plugin-app-settings/src/main/res/values/strings.xml similarity index 100% rename from plugins/app-settings/src/main/res/values/strings.xml rename to plugins/plugin-app-settings/src/main/res/values/strings.xml diff --git a/plugins/flipper/.gitignore b/plugins/plugin-flipper/.gitignore similarity index 100% rename from plugins/flipper/.gitignore rename to plugins/plugin-flipper/.gitignore diff --git a/plugins/flipper/build.gradle.kts b/plugins/plugin-flipper/build.gradle.kts similarity index 93% rename from plugins/flipper/build.gradle.kts rename to plugins/plugin-flipper/build.gradle.kts index 385067b5..14485109 100644 --- a/plugins/flipper/build.gradle.kts +++ b/plugins/plugin-flipper/build.gradle.kts @@ -48,7 +48,7 @@ android { } dependencies { - implementation(project(":core")) - implementation(project(":common")) + implementation(project(":panel-core")) + implementation(project(":panel-common")) implementation(androidx.lifecycle.runtime) } diff --git a/plugins/flipper/consumer-rules.pro b/plugins/plugin-flipper/consumer-rules.pro similarity index 100% rename from plugins/flipper/consumer-rules.pro rename to plugins/plugin-flipper/consumer-rules.pro diff --git a/plugins/flipper/proguard-rules.pro b/plugins/plugin-flipper/proguard-rules.pro similarity index 100% rename from plugins/flipper/proguard-rules.pro rename to plugins/plugin-flipper/proguard-rules.pro diff --git a/plugins/flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/FlipperPlugin.kt b/plugins/plugin-flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/FlipperPlugin.kt similarity index 100% rename from plugins/flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/FlipperPlugin.kt rename to plugins/plugin-flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/FlipperPlugin.kt diff --git a/plugins/flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/FlipperPluginContainer.kt b/plugins/plugin-flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/FlipperPluginContainer.kt similarity index 100% rename from plugins/flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/FlipperPluginContainer.kt rename to plugins/plugin-flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/FlipperPluginContainer.kt diff --git a/plugins/flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/data/FeatureTogglesRepository.kt b/plugins/plugin-flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/data/FeatureTogglesRepository.kt similarity index 100% rename from plugins/flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/data/FeatureTogglesRepository.kt rename to plugins/plugin-flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/data/FeatureTogglesRepository.kt diff --git a/plugins/flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/data/FeatureTogglesSource.kt b/plugins/plugin-flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/data/FeatureTogglesSource.kt similarity index 100% rename from plugins/flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/data/FeatureTogglesSource.kt rename to plugins/plugin-flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/data/FeatureTogglesSource.kt diff --git a/plugins/flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/ui/FlipperFeatureScreen.kt b/plugins/plugin-flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/ui/FlipperFeatureScreen.kt similarity index 100% rename from plugins/flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/ui/FlipperFeatureScreen.kt rename to plugins/plugin-flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/ui/FlipperFeatureScreen.kt diff --git a/plugins/flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/ui/FlipperFeaturesViewModel.kt b/plugins/plugin-flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/ui/FlipperFeaturesViewModel.kt similarity index 100% rename from plugins/flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/ui/FlipperFeaturesViewModel.kt rename to plugins/plugin-flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/ui/FlipperFeaturesViewModel.kt diff --git a/plugins/flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/ui/SourceSelectionViewModel.kt b/plugins/plugin-flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/ui/SourceSelectionViewModel.kt similarity index 100% rename from plugins/flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/ui/SourceSelectionViewModel.kt rename to plugins/plugin-flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/ui/SourceSelectionViewModel.kt diff --git a/plugins/flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/ui/data/FlipperItem.kt b/plugins/plugin-flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/ui/data/FlipperItem.kt similarity index 100% rename from plugins/flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/ui/data/FlipperItem.kt rename to plugins/plugin-flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/ui/data/FlipperItem.kt diff --git a/plugins/flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/ui/data/SelectableSource.kt b/plugins/plugin-flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/ui/data/SelectableSource.kt similarity index 100% rename from plugins/flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/ui/data/SelectableSource.kt rename to plugins/plugin-flipper/src/main/kotlin/com/redmadrobot/debug/plugin/flipper/ui/data/SelectableSource.kt diff --git a/plugins/flipper/src/main/res/drawable/icon_clear.xml b/plugins/plugin-flipper/src/main/res/drawable/icon_clear.xml similarity index 100% rename from plugins/flipper/src/main/res/drawable/icon_clear.xml rename to plugins/plugin-flipper/src/main/res/drawable/icon_clear.xml diff --git a/plugins/flipper/src/main/res/drawable/icon_search.xml b/plugins/plugin-flipper/src/main/res/drawable/icon_search.xml similarity index 100% rename from plugins/flipper/src/main/res/drawable/icon_search.xml rename to plugins/plugin-flipper/src/main/res/drawable/icon_search.xml diff --git a/plugins/flipper/src/main/res/values/strings.xml b/plugins/plugin-flipper/src/main/res/values/strings.xml similarity index 100% rename from plugins/flipper/src/main/res/values/strings.xml rename to plugins/plugin-flipper/src/main/res/values/strings.xml diff --git a/plugins/konfeature/.gitignore b/plugins/plugin-konfeature/.gitignore similarity index 100% rename from plugins/konfeature/.gitignore rename to plugins/plugin-konfeature/.gitignore diff --git a/plugins/konfeature/build.gradle.kts b/plugins/plugin-konfeature/build.gradle.kts similarity index 93% rename from plugins/konfeature/build.gradle.kts rename to plugins/plugin-konfeature/build.gradle.kts index df4f0796..0c0c5160 100644 --- a/plugins/konfeature/build.gradle.kts +++ b/plugins/plugin-konfeature/build.gradle.kts @@ -48,7 +48,7 @@ android { } dependencies { - implementation(project(":core")) - implementation(project(":common")) + implementation(project(":panel-core")) + implementation(project(":panel-common")) implementation(androidx.lifecycle.runtime) } diff --git a/plugins/konfeature/consumer-rules.pro b/plugins/plugin-konfeature/consumer-rules.pro similarity index 100% rename from plugins/konfeature/consumer-rules.pro rename to plugins/plugin-konfeature/consumer-rules.pro diff --git a/plugins/konfeature/proguard-rules.pro b/plugins/plugin-konfeature/proguard-rules.pro similarity index 100% rename from plugins/konfeature/proguard-rules.pro rename to plugins/plugin-konfeature/proguard-rules.pro diff --git a/plugins/konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/KonfeatureDebugPanelInterceptor.kt b/plugins/plugin-konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/KonfeatureDebugPanelInterceptor.kt similarity index 100% rename from plugins/konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/KonfeatureDebugPanelInterceptor.kt rename to plugins/plugin-konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/KonfeatureDebugPanelInterceptor.kt diff --git a/plugins/konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/KonfeaturePlugin.kt b/plugins/plugin-konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/KonfeaturePlugin.kt similarity index 100% rename from plugins/konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/KonfeaturePlugin.kt rename to plugins/plugin-konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/KonfeaturePlugin.kt diff --git a/plugins/konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/KonfeaturePluginContainer.kt b/plugins/plugin-konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/KonfeaturePluginContainer.kt similarity index 100% rename from plugins/konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/KonfeaturePluginContainer.kt rename to plugins/plugin-konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/KonfeaturePluginContainer.kt diff --git a/plugins/konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/ui/EditConfigValueDialog.kt b/plugins/plugin-konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/ui/EditConfigValueDialog.kt similarity index 100% rename from plugins/konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/ui/EditConfigValueDialog.kt rename to plugins/plugin-konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/ui/EditConfigValueDialog.kt diff --git a/plugins/konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/ui/KonfeatureScreen.kt b/plugins/plugin-konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/ui/KonfeatureScreen.kt similarity index 100% rename from plugins/konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/ui/KonfeatureScreen.kt rename to plugins/plugin-konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/ui/KonfeatureScreen.kt diff --git a/plugins/konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/ui/KonfeatureViewModel.kt b/plugins/plugin-konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/ui/KonfeatureViewModel.kt similarity index 100% rename from plugins/konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/ui/KonfeatureViewModel.kt rename to plugins/plugin-konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/ui/KonfeatureViewModel.kt diff --git a/plugins/konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/ui/data/EditDialogState.kt b/plugins/plugin-konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/ui/data/EditDialogState.kt similarity index 100% rename from plugins/konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/ui/data/EditDialogState.kt rename to plugins/plugin-konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/ui/data/EditDialogState.kt diff --git a/plugins/konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/ui/data/KonfeatureItem.kt b/plugins/plugin-konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/ui/data/KonfeatureItem.kt similarity index 100% rename from plugins/konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/ui/data/KonfeatureItem.kt rename to plugins/plugin-konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/ui/data/KonfeatureItem.kt diff --git a/plugins/konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/ui/data/KonfeatureViewState.kt b/plugins/plugin-konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/ui/data/KonfeatureViewState.kt similarity index 100% rename from plugins/konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/ui/data/KonfeatureViewState.kt rename to plugins/plugin-konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/ui/data/KonfeatureViewState.kt diff --git a/plugins/konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/util/JsonConverter.kt b/plugins/plugin-konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/util/JsonConverter.kt similarity index 100% rename from plugins/konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/util/JsonConverter.kt rename to plugins/plugin-konfeature/src/main/kotlin/com/redmadrobot/debug/plugin/konfeature/util/JsonConverter.kt diff --git a/plugins/konfeature/src/main/res/values/strings.xml b/plugins/plugin-konfeature/src/main/res/values/strings.xml similarity index 100% rename from plugins/konfeature/src/main/res/values/strings.xml rename to plugins/plugin-konfeature/src/main/res/values/strings.xml diff --git a/plugins/servers/.gitignore b/plugins/plugin-servers/.gitignore similarity index 100% rename from plugins/servers/.gitignore rename to plugins/plugin-servers/.gitignore diff --git a/plugins/servers/build.gradle.kts b/plugins/plugin-servers/build.gradle.kts similarity index 93% rename from plugins/servers/build.gradle.kts rename to plugins/plugin-servers/build.gradle.kts index 5a9fb268..4dd5a720 100644 --- a/plugins/servers/build.gradle.kts +++ b/plugins/plugin-servers/build.gradle.kts @@ -51,8 +51,8 @@ kotlin { } dependencies { - implementation(project(":core")) - implementation(project(":common")) + implementation(project(":panel-core")) + implementation(project(":panel-common")) implementation(kotlin("stdlib")) implementation(stack.kotlinx.serialization.json) kapt(androidx.room.compiler) diff --git a/plugins/servers/consumer-rules.pro b/plugins/plugin-servers/consumer-rules.pro similarity index 100% rename from plugins/servers/consumer-rules.pro rename to plugins/plugin-servers/consumer-rules.pro diff --git a/plugins/servers/proguard-rules.pro b/plugins/plugin-servers/proguard-rules.pro similarity index 100% rename from plugins/servers/proguard-rules.pro rename to plugins/plugin-servers/proguard-rules.pro diff --git a/plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/ServerSelectedEvent.kt b/plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/ServerSelectedEvent.kt similarity index 100% rename from plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/ServerSelectedEvent.kt rename to plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/ServerSelectedEvent.kt diff --git a/plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/ServersPlugin.kt b/plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/ServersPlugin.kt similarity index 100% rename from plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/ServersPlugin.kt rename to plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/ServersPlugin.kt diff --git a/plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/ServersPluginContainer.kt b/plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/ServersPluginContainer.kt similarity index 100% rename from plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/ServersPluginContainer.kt rename to plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/ServersPluginContainer.kt diff --git a/plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/DebugServerRepository.kt b/plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/DebugServerRepository.kt similarity index 100% rename from plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/DebugServerRepository.kt rename to plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/DebugServerRepository.kt diff --git a/plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/DebugStageRepository.kt b/plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/DebugStageRepository.kt similarity index 100% rename from plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/DebugStageRepository.kt rename to plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/DebugStageRepository.kt diff --git a/plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/model/DebugServer.kt b/plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/model/DebugServer.kt similarity index 100% rename from plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/model/DebugServer.kt rename to plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/model/DebugServer.kt diff --git a/plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/model/DebugServerData.kt b/plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/model/DebugServerData.kt similarity index 100% rename from plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/model/DebugServerData.kt rename to plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/model/DebugServerData.kt diff --git a/plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/model/DebugStage.kt b/plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/model/DebugStage.kt similarity index 100% rename from plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/model/DebugStage.kt rename to plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/model/DebugStage.kt diff --git a/plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/storage/DbConverters.kt b/plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/storage/DbConverters.kt similarity index 100% rename from plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/storage/DbConverters.kt rename to plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/storage/DbConverters.kt diff --git a/plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/storage/DebugServersDao.kt b/plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/storage/DebugServersDao.kt similarity index 100% rename from plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/storage/DebugServersDao.kt rename to plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/storage/DebugServersDao.kt diff --git a/plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/storage/DebugStagesDao.kt b/plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/storage/DebugStagesDao.kt similarity index 100% rename from plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/storage/DebugStagesDao.kt rename to plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/storage/DebugStagesDao.kt diff --git a/plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/storage/ServersPluginDatabase.kt b/plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/storage/ServersPluginDatabase.kt similarity index 100% rename from plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/storage/ServersPluginDatabase.kt rename to plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/storage/ServersPluginDatabase.kt diff --git a/plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/storage/SharedPreferencesFactory.kt b/plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/storage/SharedPreferencesFactory.kt similarity index 100% rename from plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/storage/SharedPreferencesFactory.kt rename to plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/storage/SharedPreferencesFactory.kt diff --git a/plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/interceptor/DebugServerInterceptor.kt b/plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/interceptor/DebugServerInterceptor.kt similarity index 100% rename from plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/interceptor/DebugServerInterceptor.kt rename to plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/interceptor/DebugServerInterceptor.kt diff --git a/plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/interceptor/DebugStageInterceptor.kt b/plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/interceptor/DebugStageInterceptor.kt similarity index 100% rename from plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/interceptor/DebugStageInterceptor.kt rename to plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/interceptor/DebugStageInterceptor.kt diff --git a/plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/ui/ServersScreen.kt b/plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/ui/ServersScreen.kt similarity index 100% rename from plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/ui/ServersScreen.kt rename to plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/ui/ServersScreen.kt diff --git a/plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/ui/ServersViewModel.kt b/plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/ui/ServersViewModel.kt similarity index 100% rename from plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/ui/ServersViewModel.kt rename to plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/ui/ServersViewModel.kt diff --git a/plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/ui/ServersViewState.kt b/plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/ui/ServersViewState.kt similarity index 100% rename from plugins/servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/ui/ServersViewState.kt rename to plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/ui/ServersViewState.kt diff --git a/plugins/servers/src/main/res/drawable/icon_add_server.xml b/plugins/plugin-servers/src/main/res/drawable/icon_add_server.xml similarity index 100% rename from plugins/servers/src/main/res/drawable/icon_add_server.xml rename to plugins/plugin-servers/src/main/res/drawable/icon_add_server.xml diff --git a/plugins/servers/src/main/res/drawable/icon_delete.xml b/plugins/plugin-servers/src/main/res/drawable/icon_delete.xml similarity index 100% rename from plugins/servers/src/main/res/drawable/icon_delete.xml rename to plugins/plugin-servers/src/main/res/drawable/icon_delete.xml diff --git a/plugins/servers/src/main/res/drawable/icon_router.xml b/plugins/plugin-servers/src/main/res/drawable/icon_router.xml similarity index 100% rename from plugins/servers/src/main/res/drawable/icon_router.xml rename to plugins/plugin-servers/src/main/res/drawable/icon_router.xml diff --git a/plugins/servers/src/main/res/drawable/icon_selected.xml b/plugins/plugin-servers/src/main/res/drawable/icon_selected.xml similarity index 100% rename from plugins/servers/src/main/res/drawable/icon_selected.xml rename to plugins/plugin-servers/src/main/res/drawable/icon_selected.xml diff --git a/plugins/servers/src/main/res/drawable/icon_stage.xml b/plugins/plugin-servers/src/main/res/drawable/icon_stage.xml similarity index 100% rename from plugins/servers/src/main/res/drawable/icon_stage.xml rename to plugins/plugin-servers/src/main/res/drawable/icon_stage.xml diff --git a/plugins/servers/src/main/res/values/public.xml b/plugins/plugin-servers/src/main/res/values/public.xml similarity index 100% rename from plugins/servers/src/main/res/values/public.xml rename to plugins/plugin-servers/src/main/res/values/public.xml diff --git a/plugins/servers/src/main/res/values/strings.xml b/plugins/plugin-servers/src/main/res/values/strings.xml similarity index 100% rename from plugins/servers/src/main/res/values/strings.xml rename to plugins/plugin-servers/src/main/res/values/strings.xml diff --git a/plugins/servers/library.properties b/plugins/servers/library.properties deleted file mode 100644 index 0d5de81c..00000000 --- a/plugins/servers/library.properties +++ /dev/null @@ -1,3 +0,0 @@ -lib_name = plugin-servers -lib_vcs=https://github.com/RedMadRobot/debug-panel-android.git -lib_issue_tracker=https://github.com/RedMadRobot/debug-panel-android/issues diff --git a/release.sh b/release.sh new file mode 100644 index 00000000..f86531e3 --- /dev/null +++ b/release.sh @@ -0,0 +1,111 @@ +#!/usr/bin/env bash +# +# Prepares the library for release. Creates a release branch from the 'main'. +# +# Usage: ./release.sh [version] +# Example: ./release.sh 1.0.0 +# +# Original release script: https://github.com/RedMadRobot/android-library-template/blob/main/release.sh + +set -euo pipefail + +# The script could be run from any directory. +cd "$(dirname "$0")" + +# Configure the script +properties="gradle.properties" +changelog="CHANGELOG.md" +readme="README.md" +files_to_update_version=("$properties" "$readme") +github_repository_url="https://github.com/RedMadRobot/debug-panel-android" + +#region Utils +function error() { + echo "❌ $1" + return 1 +} + +function property { + grep "^${1}=" "$properties" | cut -d'=' -f2 +} + +function replace() { + # Escape linebreaks + local replacement=${2//$'\n'/\\\n} + # Portable in-place edit. + # See: https://stackoverflow.com/a/4247319 + sed -i".bak" -E "s~$1~$replacement~g" "$3" + rm "$3.bak" +} + +function diff_link() { + echo -n "$github_repository_url/compare/${1}...${2}" +} +#endregion + +# Validate input parameters +version=${1:-Please, specify the version to be released as a script parameter} +[[ $version != v* ]] || error "The version should not start from 'v'" +version_tag="v$version" + +# 0. Fetch remote changes +echo "️⏳ Creating release branch..." +release_branch="release/$version" +git checkout --quiet -b "$release_branch" +git pull --quiet --rebase origin main +echo "✅ Branch '$release_branch' created" +echo + +# 1. Calculate version values for later +last_version=$(property "version") +if [[ "$last_version" == "$version" ]]; then + echo "🤔 Version $version is already set." + exit 0 +fi +echo "🚀 Update $last_version → $version" +echo + +# 2. Update version everywhere +for file in "${files_to_update_version[@]}" ; do + replace "$last_version" "$version" "$file" + echo "✅ Updated version in $file" +done + +# 3. Update header in CHANGELOG.md +date=$(date -u +%Y-%m-%d) +header_replacement=\ +"## [Unreleased] + +### Changes + +- *No changes* + +## [$version] ($date)" +replace "^## \[Unreleased\].*" "$header_replacement" "$changelog" +echo "✅ Updated CHANGELOG.md header" + +# 4. Add link to version diff +unreleased_diff_link="[unreleased]: $(diff_link "$version_tag" "main")" +version_diff_link="[$version]: $(diff_link "v$last_version" "$version_tag")" +replace "^\[unreleased\]:.*" "$unreleased_diff_link\n$version_diff_link" "$changelog" +echo "✅ Added a diff link to CHANGELOG.md" + +# 5. Ask if the changes should be pushed to remote branch +echo +echo "Do you want to commit the changes and push the release branch and tag?" +echo "The release tag push triggers a release workflow on CI." +read -p " Enter 'yes' to continue: " -r input +if [[ "$input" != "yes" ]]; then + echo "👌 SKIPPED." + exit 0 +fi + +# 6. Push changes and trigger release on CI +echo +echo "⏳ Pushing the changes to the remote repository..." +git add "$readme" "$changelog" "$properties" +git commit --quiet --message "version: $version" +git tag "$version_tag" +git push --quiet origin HEAD "$version_tag" +echo "🎉 DONE." +echo "Create a Pull Request: $(diff_link "main" "$release_branch")" diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index 26b642b4..1ceb3bea 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -47,15 +47,15 @@ dependencies { implementation(stack.timber) implementation(stack.kotlinx.coroutines.android) implementation(androidx.lifecycle.runtime) - debugImplementation(project(":core")) - debugImplementation(project(":plugins:servers")) + debugImplementation(project(":panel-core")) + debugImplementation(project(":plugins:plugin-servers")) + debugImplementation(project(":plugins:plugin-accounts")) + debugImplementation(project(":plugins:plugin-app-settings")) // Debug panel dependencies - debugImplementation(project(":plugins:accounts")) - debugImplementation(project(":plugins:app-settings")) - debugImplementation(project(":plugins:flipper")) - debugImplementation(project(":plugins:konfeature")) - releaseImplementation(project(":no-op")) + debugImplementation(project(":plugins:plugin-flipper")) + debugImplementation(project(":plugins:plugin-konfeature")) + releaseImplementation(project(":panel-no-op")) implementation(stack.retrofit) } diff --git a/scripts/publish.sh b/scripts/publish.sh deleted file mode 100755 index be2c0ac1..00000000 --- a/scripts/publish.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -#Bash script for debug panel builds and publishing. - -# Navigate up one directory to be outside of the bin directory and into the app's home directory -DIR="${0%/*}" -cd "$DIR/.." - -# Clean and then build and publish Debug Panel artifacts -./gradlew clean publishToSonatype closeAndReleaseSonatypeStagingRepository diff --git a/scripts/publishToLocal.sh b/scripts/publishToLocal.sh deleted file mode 100755 index 98d234e7..00000000 --- a/scripts/publishToLocal.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -#Bash script for debug panel builds and publishing. - -# Navigate up one directory to be outside of the bin directory and into the app's home directory -DIR="${0%/*}" -cd "$DIR/.." - -# Clean and then build and publish Debug Panel artifacts -./gradlew clean publishToMavenLocal diff --git a/settings.gradle.kts b/settings.gradle.kts index e02eee7a..0be26cb7 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -31,18 +31,18 @@ dependencyResolutionManagement { // Base modules include( - ":common", - ":no-op", - ":core" + ":panel-common", + ":panel-no-op", + ":panel-core" ) // Plugins include( - ":plugins:accounts", - ":plugins:servers", - ":plugins:app-settings", - ":plugins:flipper", - ":plugins:konfeature", + ":plugins:plugin-accounts", + ":plugins:plugin-servers", + ":plugins:plugin-app-settings", + ":plugins:plugin-flipper", + ":plugins:plugin-konfeature", ) include(":sample")