Move FileSizeFormatter to module :libraries:androidutils

libraries/androidtools/api/build.gradle.kts

@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2023 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-plugins {
-    id("io.element.android-library")
-}
-
-android {
-    namespace = "io.element.android.libraries.androidtools.api"
-}

libraries/androidtools/impl/build.gradle.kts

@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2023 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-plugins {
-    id("io.element.android-library")
-    alias(libs.plugins.ksp)
-    alias(libs.plugins.anvil)
-}
-
-anvil {
-    generateDaggerFactories.set(true)
-}
-
-android {
-    namespace = "io.element.android.libraries.androidtools.impl"
-
-    dependencies {
-        anvil(projects.anvilcodegen)
-        implementation(libs.dagger)
-        implementation(projects.libraries.di)
-        implementation(projects.anvilannotations)
-
-        api(projects.libraries.androidtools.api)
-
-        testImplementation(libs.test.junit)
-        testImplementation(libs.test.truth)
-        testImplementation(projects.libraries.androidtools.test)
-    }
-}

libraries/androidtools/test/build.gradle.kts

@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2023 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-plugins {
-    id("io.element.android-library")
-}
-
-android {
-    namespace = "io.element.android.libraries.androidtools.test"
-
-    dependencies {
-        api(projects.libraries.androidtools.api)
-    }
-}

libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize/AndroidFileSizeFormatter.kt

@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-package io.element.android.libraries.androidtools.impl
+package io.element.android.libraries.androidutils.filesize
 
 import android.content.Context
 import android.os.Build
 import android.text.format.Formatter
 import com.squareup.anvil.annotations.ContributesBinding
-import io.element.android.libraries.androidtools.api.FileSizeFormatter
 import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.di.ApplicationContext
 import javax.inject.Inject

libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize/FakeFileSizeFormatter.kt

@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.libraries.androidtools.test
-
-import io.element.android.libraries.androidtools.api.FileSizeFormatter
+package io.element.android.libraries.androidutils.filesize
 
 class FakeFileSizeFormatter : FileSizeFormatter {
     override fun format(fileSize: Long, useShortFormat: Boolean): String {

libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/filesize/FileSizeFormatter.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.libraries.androidtools.api
+package io.element.android.libraries.androidutils.filesize
 
 interface FileSizeFormatter {
     /**