diff --git a/.github/workflows/Android-CI-Espresso.yml b/.github/workflows/Android-CI-Espresso.yml index 50839788..2b4254ef 100644 --- a/.github/workflows/Android-CI-Espresso.yml +++ b/.github/workflows/Android-CI-Espresso.yml @@ -57,7 +57,7 @@ jobs: - name: Build project run: ./gradlew assembleDebug - name: Test publish to jitpack.io - run: ./gradlew :LogcatCoreLib:assembleRelease :LogcatCoreLib:publishToMavenLocal :LogcatCoreUI:assembleRelease :LogcatCoreUI:publishToMavenLocal :LogcatCrashlyticLib:assembleRelease :LogcatCrashlyticLib:publishToMavenLocal :LogcatCountlyLib:assembleRelease :LogcatCountlyLib:publishToMavenLocal + run: ./gradlew :core:assembleRelease :core:publishToMavenLocal :coreui:assembleRelease :coreui:publishToMavenLocal :crashlytic:assembleRelease :crashlytic:publishToMavenLocal :countly:assembleRelease :countly:publishToMavenLocal - name: Run instrumentation tests uses: hannesa2/action-android/emulator-run-cmd@0.1.16.7 with: diff --git a/.github/workflows/Android-CI-release.yml b/.github/workflows/Android-CI-release.yml index 17f3aa3c..6a303c7e 100644 --- a/.github/workflows/Android-CI-release.yml +++ b/.github/workflows/Android-CI-release.yml @@ -51,9 +51,9 @@ jobs: name: ${{steps.tagger.outputs.tag}} generate_release_notes: true files: | - LogcatCrashlyticLib/build/outputs/aar/crashlytic-release.aar + crashlytic/build/outputs/aar/crashlytic-release.aar LogcatCountlyLib/build/outputs/aar/countly-release.aar - LogcatCoreLib/build/outputs/aar/core-release.aar - LogcatCoreUi/build/outputs/aar/coreui-release.aar + core/build/outputs/aar/core-release.aar + coreui/build/outputs/aar/coreui-release.aar env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index 82615891..d6397e2f 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,9 @@ The easiest way to add Logcat to your project is via Gradle. Just add the follow ```groovy dependencies { - implementation "com.github.AppDevNext.Logcat:LogcatCoreLib:$latest_version" - implementation "com.github.AppDevNext.Logcat:LogcatCoreUI:$latest_version" // UI related classes like Activity, Fragment - implementation 'com.github.AppDevNext.Logcat:LogcatCrashlyticLib:$latest_version' + implementation "com.github.AppDevNext.Logcat:core:$latest_version" + implementation "com.github.AppDevNext.Logcat:coreui:$latest_version" // UI related classes like Activity, Fragment + implementation 'com.github.AppDevNext.Logcat:crashlytic:$latest_version' } ``` @@ -85,7 +85,7 @@ or for file logging To avoid build failure due to higher version of kotlinx-coroutines-android (you are then responsible for loading the excluded required dependencies) - implementation('com.github.AppDevNext.Logcat:LogcatCore:$latest_version') { + implementation('com.github.AppDevNext.Logcat:core:$latest_version') { exclude group: 'androidx.lifecycle' exclude group: 'org.jetbrains.kotlin' exclude group: 'org.jetbrains.kotlinx' diff --git a/LogcatCoreLib/build.gradle b/core/build.gradle similarity index 100% rename from LogcatCoreLib/build.gradle rename to core/build.gradle diff --git a/LogcatCoreLib/consumer.pro b/core/consumer.pro similarity index 100% rename from LogcatCoreLib/consumer.pro rename to core/consumer.pro diff --git a/LogcatCoreLib/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml similarity index 100% rename from LogcatCoreLib/src/main/AndroidManifest.xml rename to core/src/main/AndroidManifest.xml diff --git a/LogcatCoreLib/src/main/java/info/hannes/logcat/Event.kt b/core/src/main/java/info/hannes/logcat/Event.kt similarity index 100% rename from LogcatCoreLib/src/main/java/info/hannes/logcat/Event.kt rename to core/src/main/java/info/hannes/logcat/Event.kt diff --git a/LogcatCoreLib/src/main/java/info/hannes/logcat/FileLoggingApplication.kt b/core/src/main/java/info/hannes/logcat/FileLoggingApplication.kt similarity index 100% rename from LogcatCoreLib/src/main/java/info/hannes/logcat/FileLoggingApplication.kt rename to core/src/main/java/info/hannes/logcat/FileLoggingApplication.kt diff --git a/LogcatCoreLib/src/main/java/info/hannes/logcat/LoggingApplication.kt b/core/src/main/java/info/hannes/logcat/LoggingApplication.kt similarity index 100% rename from LogcatCoreLib/src/main/java/info/hannes/logcat/LoggingApplication.kt rename to core/src/main/java/info/hannes/logcat/LoggingApplication.kt diff --git a/LogcatCoreLib/src/main/java/info/hannes/logcat/LoggingTools.kt b/core/src/main/java/info/hannes/logcat/LoggingTools.kt similarity index 100% rename from LogcatCoreLib/src/main/java/info/hannes/logcat/LoggingTools.kt rename to core/src/main/java/info/hannes/logcat/LoggingTools.kt diff --git a/LogcatCoreLib/src/main/java/info/hannes/timber/DebugFormatTree.kt b/core/src/main/java/info/hannes/timber/DebugFormatTree.kt similarity index 100% rename from LogcatCoreLib/src/main/java/info/hannes/timber/DebugFormatTree.kt rename to core/src/main/java/info/hannes/timber/DebugFormatTree.kt diff --git a/LogcatCoreLib/src/main/java/info/hannes/timber/FileLoggingTree.kt b/core/src/main/java/info/hannes/timber/FileLoggingTree.kt similarity index 100% rename from LogcatCoreLib/src/main/java/info/hannes/timber/FileLoggingTree.kt rename to core/src/main/java/info/hannes/timber/FileLoggingTree.kt diff --git a/LogcatCoreLib/src/main/java/info/hannes/timber/TimberExtensions.kt b/core/src/main/java/info/hannes/timber/TimberExtensions.kt similarity index 100% rename from LogcatCoreLib/src/main/java/info/hannes/timber/TimberExtensions.kt rename to core/src/main/java/info/hannes/timber/TimberExtensions.kt diff --git a/LogcatCoreLib/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml similarity index 100% rename from LogcatCoreLib/src/main/res/values/strings.xml rename to core/src/main/res/values/strings.xml diff --git a/LogcatCoreLib/src/main/res/xml/provider_paths.xml b/core/src/main/res/xml/provider_paths.xml similarity index 100% rename from LogcatCoreLib/src/main/res/xml/provider_paths.xml rename to core/src/main/res/xml/provider_paths.xml diff --git a/LogcatCoreUI/build.gradle b/coreui/build.gradle similarity index 97% rename from LogcatCoreUI/build.gradle rename to coreui/build.gradle index c57b7804..0b544312 100644 --- a/LogcatCoreUI/build.gradle +++ b/coreui/build.gradle @@ -24,7 +24,7 @@ android { } dependencies { - api project(':LogcatCoreLib') + api project(':core') implementation "androidx.core:core-ktx:1.13.1" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1" diff --git a/LogcatCoreUI/src/main/AndroidManifest.xml b/coreui/src/main/AndroidManifest.xml similarity index 100% rename from LogcatCoreUI/src/main/AndroidManifest.xml rename to coreui/src/main/AndroidManifest.xml diff --git a/LogcatCoreUI/src/main/java/info/hannes/logcat/base/LoadingDialog.kt b/coreui/src/main/java/info/hannes/logcat/base/LoadingDialog.kt similarity index 100% rename from LogcatCoreUI/src/main/java/info/hannes/logcat/base/LoadingDialog.kt rename to coreui/src/main/java/info/hannes/logcat/base/LoadingDialog.kt diff --git a/LogcatCoreUI/src/main/java/info/hannes/logcat/base/LogBaseFragment.kt b/coreui/src/main/java/info/hannes/logcat/base/LogBaseFragment.kt similarity index 100% rename from LogcatCoreUI/src/main/java/info/hannes/logcat/base/LogBaseFragment.kt rename to coreui/src/main/java/info/hannes/logcat/base/LogBaseFragment.kt diff --git a/LogcatCoreUI/src/main/java/info/hannes/logcat/base/LogListAdapter.kt b/coreui/src/main/java/info/hannes/logcat/base/LogListAdapter.kt similarity index 100% rename from LogcatCoreUI/src/main/java/info/hannes/logcat/base/LogListAdapter.kt rename to coreui/src/main/java/info/hannes/logcat/base/LogListAdapter.kt diff --git a/LogcatCoreUI/src/main/java/info/hannes/logcat/ui/BothLogActivity.kt b/coreui/src/main/java/info/hannes/logcat/ui/BothLogActivity.kt similarity index 100% rename from LogcatCoreUI/src/main/java/info/hannes/logcat/ui/BothLogActivity.kt rename to coreui/src/main/java/info/hannes/logcat/ui/BothLogActivity.kt diff --git a/LogcatCoreUI/src/main/java/info/hannes/logcat/ui/BothLogsFragment.kt b/coreui/src/main/java/info/hannes/logcat/ui/BothLogsFragment.kt similarity index 100% rename from LogcatCoreUI/src/main/java/info/hannes/logcat/ui/BothLogsFragment.kt rename to coreui/src/main/java/info/hannes/logcat/ui/BothLogsFragment.kt diff --git a/LogcatCoreUI/src/main/java/info/hannes/logcat/ui/LogcatActivity.kt b/coreui/src/main/java/info/hannes/logcat/ui/LogcatActivity.kt similarity index 100% rename from LogcatCoreUI/src/main/java/info/hannes/logcat/ui/LogcatActivity.kt rename to coreui/src/main/java/info/hannes/logcat/ui/LogcatActivity.kt diff --git a/LogcatCoreUI/src/main/java/info/hannes/logcat/ui/LogcatFragment.kt b/coreui/src/main/java/info/hannes/logcat/ui/LogcatFragment.kt similarity index 100% rename from LogcatCoreUI/src/main/java/info/hannes/logcat/ui/LogcatFragment.kt rename to coreui/src/main/java/info/hannes/logcat/ui/LogcatFragment.kt diff --git a/LogcatCoreUI/src/main/java/info/hannes/logcat/ui/LogfileActivity.kt b/coreui/src/main/java/info/hannes/logcat/ui/LogfileActivity.kt similarity index 100% rename from LogcatCoreUI/src/main/java/info/hannes/logcat/ui/LogfileActivity.kt rename to coreui/src/main/java/info/hannes/logcat/ui/LogfileActivity.kt diff --git a/LogcatCoreUI/src/main/java/info/hannes/logcat/ui/LogfileFragment.kt b/coreui/src/main/java/info/hannes/logcat/ui/LogfileFragment.kt similarity index 100% rename from LogcatCoreUI/src/main/java/info/hannes/logcat/ui/LogfileFragment.kt rename to coreui/src/main/java/info/hannes/logcat/ui/LogfileFragment.kt diff --git a/LogcatCoreUI/src/main/java/info/hannes/logcat/ui/TabsAdapter.kt b/coreui/src/main/java/info/hannes/logcat/ui/TabsAdapter.kt similarity index 100% rename from LogcatCoreUI/src/main/java/info/hannes/logcat/ui/TabsAdapter.kt rename to coreui/src/main/java/info/hannes/logcat/ui/TabsAdapter.kt diff --git a/LogcatCoreUI/src/main/res/drawable/ic_menu_delete_24.xml b/coreui/src/main/res/drawable/ic_menu_delete_24.xml similarity index 100% rename from LogcatCoreUI/src/main/res/drawable/ic_menu_delete_24.xml rename to coreui/src/main/res/drawable/ic_menu_delete_24.xml diff --git a/LogcatCoreUI/src/main/res/drawable/ic_menu_search_24.xml b/coreui/src/main/res/drawable/ic_menu_search_24.xml similarity index 100% rename from LogcatCoreUI/src/main/res/drawable/ic_menu_search_24.xml rename to coreui/src/main/res/drawable/ic_menu_search_24.xml diff --git a/LogcatCoreUI/src/main/res/drawable/ic_menu_share_24.xml b/coreui/src/main/res/drawable/ic_menu_share_24.xml similarity index 100% rename from LogcatCoreUI/src/main/res/drawable/ic_menu_share_24.xml rename to coreui/src/main/res/drawable/ic_menu_share_24.xml diff --git a/LogcatCoreUI/src/main/res/layout/activity_log.xml b/coreui/src/main/res/layout/activity_log.xml similarity index 100% rename from LogcatCoreUI/src/main/res/layout/activity_log.xml rename to coreui/src/main/res/layout/activity_log.xml diff --git a/LogcatCoreUI/src/main/res/layout/content_log.xml b/coreui/src/main/res/layout/content_log.xml similarity index 100% rename from LogcatCoreUI/src/main/res/layout/content_log.xml rename to coreui/src/main/res/layout/content_log.xml diff --git a/LogcatCoreUI/src/main/res/layout/fragment_both_logs.xml b/coreui/src/main/res/layout/fragment_both_logs.xml similarity index 100% rename from LogcatCoreUI/src/main/res/layout/fragment_both_logs.xml rename to coreui/src/main/res/layout/fragment_both_logs.xml diff --git a/LogcatCoreUI/src/main/res/layout/fragment_log.xml b/coreui/src/main/res/layout/fragment_log.xml similarity index 100% rename from LogcatCoreUI/src/main/res/layout/fragment_log.xml rename to coreui/src/main/res/layout/fragment_log.xml diff --git a/LogcatCoreUI/src/main/res/layout/item_log.xml b/coreui/src/main/res/layout/item_log.xml similarity index 100% rename from LogcatCoreUI/src/main/res/layout/item_log.xml rename to coreui/src/main/res/layout/item_log.xml diff --git a/LogcatCoreUI/src/main/res/layout/loading_dialog.xml b/coreui/src/main/res/layout/loading_dialog.xml similarity index 100% rename from LogcatCoreUI/src/main/res/layout/loading_dialog.xml rename to coreui/src/main/res/layout/loading_dialog.xml diff --git a/LogcatCoreUI/src/main/res/menu/menu_log.xml b/coreui/src/main/res/menu/menu_log.xml similarity index 100% rename from LogcatCoreUI/src/main/res/menu/menu_log.xml rename to coreui/src/main/res/menu/menu_log.xml diff --git a/LogcatCoreUI/src/main/res/values/attrs.xml b/coreui/src/main/res/values/attrs.xml similarity index 100% rename from LogcatCoreUI/src/main/res/values/attrs.xml rename to coreui/src/main/res/values/attrs.xml diff --git a/LogcatCoreUI/src/main/res/values/colors.xml b/coreui/src/main/res/values/colors.xml similarity index 100% rename from LogcatCoreUI/src/main/res/values/colors.xml rename to coreui/src/main/res/values/colors.xml diff --git a/LogcatCoreUI/src/main/res/values/styles.xml b/coreui/src/main/res/values/styles.xml similarity index 100% rename from LogcatCoreUI/src/main/res/values/styles.xml rename to coreui/src/main/res/values/styles.xml diff --git a/LogcatCoreUI/src/main/res/xml/provider_paths.xml b/coreui/src/main/res/xml/provider_paths.xml similarity index 100% rename from LogcatCoreUI/src/main/res/xml/provider_paths.xml rename to coreui/src/main/res/xml/provider_paths.xml diff --git a/LogcatCountlyLib/build.gradle b/countly/build.gradle similarity index 94% rename from LogcatCountlyLib/build.gradle rename to countly/build.gradle index cf42b2f3..674dcbf3 100644 --- a/LogcatCountlyLib/build.gradle +++ b/countly/build.gradle @@ -19,7 +19,7 @@ android { } dependencies { - api project(':LogcatCoreLib') + api project(':core') api "ly.count.android:sdk:24.4.1" } diff --git a/LogcatCountlyLib/src/main/AndroidManifest.xml b/countly/src/main/AndroidManifest.xml similarity index 100% rename from LogcatCountlyLib/src/main/AndroidManifest.xml rename to countly/src/main/AndroidManifest.xml diff --git a/LogcatCountlyLib/src/main/java/info/hannes/countly/Analytics.kt b/countly/src/main/java/info/hannes/countly/Analytics.kt similarity index 100% rename from LogcatCountlyLib/src/main/java/info/hannes/countly/Analytics.kt rename to countly/src/main/java/info/hannes/countly/Analytics.kt diff --git a/LogcatCountlyLib/src/main/java/info/hannes/countly/IAnalytics.kt b/countly/src/main/java/info/hannes/countly/IAnalytics.kt similarity index 100% rename from LogcatCountlyLib/src/main/java/info/hannes/countly/IAnalytics.kt rename to countly/src/main/java/info/hannes/countly/IAnalytics.kt diff --git a/LogcatCountlyLib/src/main/java/info/hannes/logging/LoggingCountlyApplication.kt b/countly/src/main/java/info/hannes/logging/LoggingCountlyApplication.kt similarity index 100% rename from LogcatCountlyLib/src/main/java/info/hannes/logging/LoggingCountlyApplication.kt rename to countly/src/main/java/info/hannes/logging/LoggingCountlyApplication.kt diff --git a/LogcatCountlyLib/src/main/java/info/hannes/timber/CountlyTree.kt b/countly/src/main/java/info/hannes/timber/CountlyTree.kt similarity index 100% rename from LogcatCountlyLib/src/main/java/info/hannes/timber/CountlyTree.kt rename to countly/src/main/java/info/hannes/timber/CountlyTree.kt diff --git a/LogcatCrashlyticLib/build.gradle b/crashlytic/build.gradle similarity index 96% rename from LogcatCrashlyticLib/build.gradle rename to crashlytic/build.gradle index 2742c9ec..3980da69 100644 --- a/LogcatCrashlyticLib/build.gradle +++ b/crashlytic/build.gradle @@ -20,7 +20,7 @@ android { } dependencies { - api project(':LogcatCoreLib') + api project(':core') // Import the BoM for the Firebase platform api platform('com.google.firebase:firebase-bom:33.5.0') diff --git a/LogcatCrashlyticLib/src/main/AndroidManifest.xml b/crashlytic/src/main/AndroidManifest.xml similarity index 100% rename from LogcatCrashlyticLib/src/main/AndroidManifest.xml rename to crashlytic/src/main/AndroidManifest.xml diff --git a/LogcatCrashlyticLib/src/main/java/info/hannes/crashlytic/CrashlyticsTree.kt b/crashlytic/src/main/java/info/hannes/crashlytic/CrashlyticsTree.kt similarity index 100% rename from LogcatCrashlyticLib/src/main/java/info/hannes/crashlytic/CrashlyticsTree.kt rename to crashlytic/src/main/java/info/hannes/crashlytic/CrashlyticsTree.kt diff --git a/jitpack.yml b/jitpack.yml index c870d353..29b7884b 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,4 +1,4 @@ jdk: - openjdk17 install: - - ./gradlew :LogcatCoreLib:assembleRelease :LogcatCoreLib:publishToMavenLocal :LogcatCoreUI:assembleRelease :LogcatCoreUI:publishToMavenLocal :LogcatCrashlyticLib:assembleRelease :LogcatCrashlyticLib:publishToMavenLocal :LogcatCountlyLib:assembleRelease :LogcatCountlyLib:publishToMavenLocal \ No newline at end of file + - ./gradlew :core:assembleRelease :core:publishToMavenLocal :coreui:assembleRelease :coreui:publishToMavenLocal :crashlytic:assembleRelease :crashlytic:publishToMavenLocal :countly:assembleRelease :countly:publishToMavenLocal \ No newline at end of file diff --git a/sample/build.gradle b/sample/build.gradle index a76bbcc7..0b38c60e 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -53,10 +53,10 @@ android { } dependencies { - implementation project(':LogcatCoreLib') - implementation project(':LogcatCoreUI') - implementation project(':LogcatCrashlyticLib') - implementation project(':LogcatCountlyLib') + implementation project(':core') + implementation project(':coreui') + implementation project(':crashlytic') + implementation project(':crashlytic') implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation "androidx.appcompat:appcompat:1.7.0" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" diff --git a/settings.gradle b/settings.gradle index 371b9d48..33f4d8f7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,5 @@ -include ':LogcatCoreLib' -include ':LogcatCoreUI' -include ':LogcatCrashlyticLib' -include ':LogcatCountlyLib' -include ':sample' \ No newline at end of file +include ':core' +include ':coreui' +include ':crashlytic' +include ':countly' +include ':app' \ No newline at end of file