From 42564c71cfb70c28831c662a3b6bf4084e079353 Mon Sep 17 00:00:00 2001 From: Joel Klinghed Date: Mon, 15 Jul 2024 23:52:28 +0200 Subject: Break out io code in libs Preparing for adding more io implementations. Really tried writing the convention plugins in kotlin dsl but could not find the exact right hacks to get it to work. --- .gitignore | 2 +- .idea/gradle.xml | 16 + app/.gitignore | 1 - app/build.gradle.kts | 34 +-- .../java/org/the_jk/cleversync/LiveDataUtils.kt | 14 - .../main/java/org/the_jk/cleversync/StringUtils.kt | 32 -- .../java/org/the_jk/cleversync/io/Directory.kt | 20 -- app/src/main/java/org/the_jk/cleversync/io/File.kt | 12 - app/src/main/java/org/the_jk/cleversync/io/Link.kt | 13 - .../the_jk/cleversync/io/ModifiableDirectory.kt | 28 -- .../org/the_jk/cleversync/io/ModifiableFile.kt | 7 - .../org/the_jk/cleversync/io/ModifiableLink.kt | 15 - .../org/the_jk/cleversync/io/ModifiableTree.kt | 3 - app/src/main/java/org/the_jk/cleversync/io/Tree.kt | 7 - .../java/org/the_jk/cleversync/io/TreeFactory.kt | 8 +- .../org/the_jk/cleversync/io/impl/PathDirectory.kt | 188 ------------ .../java/org/the_jk/cleversync/io/impl/PathFile.kt | 66 ----- .../java/org/the_jk/cleversync/io/impl/PathLink.kt | 62 ---- .../java/org/the_jk/cleversync/io/impl/PathTree.kt | 10 - .../org/the_jk/cleversync/io/impl/PathWatcher.kt | 82 ------ .../java/org/the_jk/cleversync/StringUtilsTest.kt | 40 --- .../java/org/the_jk/cleversync/io/LocalTreeTest.kt | 323 -------------------- build.gradle.kts | 11 + buildSrc/build.gradle.kts | 25 ++ buildSrc/settings.gradle.kts | 9 + .../main/groovy/the_jk.android-conventions.gradle | 45 +++ gradle/libs.versions.toml | 5 +- libs/io/build.gradle.kts | 12 + .../java/org/the_jk/cleversync/io/Directory.kt | 20 ++ .../src/main/java/org/the_jk/cleversync/io/File.kt | 12 + .../src/main/java/org/the_jk/cleversync/io/Link.kt | 13 + .../the_jk/cleversync/io/ModifiableDirectory.kt | 28 ++ .../org/the_jk/cleversync/io/ModifiableFile.kt | 7 + .../org/the_jk/cleversync/io/ModifiableLink.kt | 15 + .../org/the_jk/cleversync/io/ModifiableTree.kt | 3 + .../src/main/java/org/the_jk/cleversync/io/Tree.kt | 7 + libs/local/build.gradle.kts | 12 + .../the_jk/cleversync/io/local/PathDirectory.kt | 188 ++++++++++++ .../org/the_jk/cleversync/io/local/PathFile.kt | 66 +++++ .../org/the_jk/cleversync/io/local/PathLink.kt | 62 ++++ .../org/the_jk/cleversync/io/local/PathTree.kt | 10 + .../org/the_jk/cleversync/io/local/PathWatcher.kt | 82 ++++++ .../the_jk/cleversync/local/LocalTreeFactory.kt | 16 + libs/local/src/main/res/values/strings.xml | 3 + .../org/the_jk/cleversync/local/LocalTreeTest.kt | 327 +++++++++++++++++++++ libs/utils/build.gradle.kts | 12 + .../java/org/the_jk/cleversync/LiveDataUtils.kt | 14 + .../main/java/org/the_jk/cleversync/StringUtils.kt | 32 ++ .../java/org/the_jk/cleversync/StringUtilsTest.kt | 40 +++ settings.gradle.kts | 3 + 50 files changed, 1104 insertions(+), 958 deletions(-) delete mode 100644 app/.gitignore delete mode 100644 app/src/main/java/org/the_jk/cleversync/LiveDataUtils.kt delete mode 100644 app/src/main/java/org/the_jk/cleversync/StringUtils.kt delete mode 100644 app/src/main/java/org/the_jk/cleversync/io/Directory.kt delete mode 100644 app/src/main/java/org/the_jk/cleversync/io/File.kt delete mode 100644 app/src/main/java/org/the_jk/cleversync/io/Link.kt delete mode 100644 app/src/main/java/org/the_jk/cleversync/io/ModifiableDirectory.kt delete mode 100644 app/src/main/java/org/the_jk/cleversync/io/ModifiableFile.kt delete mode 100644 app/src/main/java/org/the_jk/cleversync/io/ModifiableLink.kt delete mode 100644 app/src/main/java/org/the_jk/cleversync/io/ModifiableTree.kt delete mode 100644 app/src/main/java/org/the_jk/cleversync/io/Tree.kt delete mode 100644 app/src/main/java/org/the_jk/cleversync/io/impl/PathDirectory.kt delete mode 100644 app/src/main/java/org/the_jk/cleversync/io/impl/PathFile.kt delete mode 100644 app/src/main/java/org/the_jk/cleversync/io/impl/PathLink.kt delete mode 100644 app/src/main/java/org/the_jk/cleversync/io/impl/PathTree.kt delete mode 100644 app/src/main/java/org/the_jk/cleversync/io/impl/PathWatcher.kt delete mode 100644 app/src/test/java/org/the_jk/cleversync/StringUtilsTest.kt delete mode 100644 app/src/test/java/org/the_jk/cleversync/io/LocalTreeTest.kt create mode 100644 buildSrc/build.gradle.kts create mode 100644 buildSrc/settings.gradle.kts create mode 100644 buildSrc/src/main/groovy/the_jk.android-conventions.gradle create mode 100644 libs/io/build.gradle.kts create mode 100644 libs/io/src/main/java/org/the_jk/cleversync/io/Directory.kt create mode 100644 libs/io/src/main/java/org/the_jk/cleversync/io/File.kt create mode 100644 libs/io/src/main/java/org/the_jk/cleversync/io/Link.kt create mode 100644 libs/io/src/main/java/org/the_jk/cleversync/io/ModifiableDirectory.kt create mode 100644 libs/io/src/main/java/org/the_jk/cleversync/io/ModifiableFile.kt create mode 100644 libs/io/src/main/java/org/the_jk/cleversync/io/ModifiableLink.kt create mode 100644 libs/io/src/main/java/org/the_jk/cleversync/io/ModifiableTree.kt create mode 100644 libs/io/src/main/java/org/the_jk/cleversync/io/Tree.kt create mode 100644 libs/local/build.gradle.kts create mode 100644 libs/local/src/main/java/org/the_jk/cleversync/io/local/PathDirectory.kt create mode 100644 libs/local/src/main/java/org/the_jk/cleversync/io/local/PathFile.kt create mode 100644 libs/local/src/main/java/org/the_jk/cleversync/io/local/PathLink.kt create mode 100644 libs/local/src/main/java/org/the_jk/cleversync/io/local/PathTree.kt create mode 100644 libs/local/src/main/java/org/the_jk/cleversync/io/local/PathWatcher.kt create mode 100644 libs/local/src/main/java/org/the_jk/cleversync/local/LocalTreeFactory.kt create mode 100644 libs/local/src/main/res/values/strings.xml create mode 100644 libs/local/src/test/java/org/the_jk/cleversync/local/LocalTreeTest.kt create mode 100644 libs/utils/build.gradle.kts create mode 100644 libs/utils/src/main/java/org/the_jk/cleversync/LiveDataUtils.kt create mode 100644 libs/utils/src/main/java/org/the_jk/cleversync/StringUtils.kt create mode 100644 libs/utils/src/test/java/org/the_jk/cleversync/StringUtilsTest.kt diff --git a/.gitignore b/.gitignore index aa724b7..b2ed268 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ /.idea/navEditor.xml /.idea/assetWizardSettings.xml .DS_Store -/build +build /captures .externalNativeBuild .cxx diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 0897082..cc8d323 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,12 +4,28 @@