Fix ktlint error around sourceset shared across modules

2025-08-03 18:56:44 -04:00 · 2019-10-16 14:27:37 +01:00 · 2019-10-16 14:27:37 +01:00 · 381e2bd9d8
commit 381e2bd9d8
parent 8d8e5250fd
17 changed files with 37 additions and 36 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -52,7 +52,7 @@ before_script:
  - adb shell input keyevent 82 &

 script:
-  - ./gradlew createDebugCoverageReport lint jacocoTestReport app:assembleRelease
+  - ./gradlew createDebugCoverageReport ktlintCheck lint jacocoTestReport app:assembleRelease

 after_success:
  - bash <(curl -s https://codecov.io/bash)
--- a/app/build.gradle
+++ b/app/build.gradle
@ -92,9 +92,10 @@ android {
          variant.versionCode
    }
  }
+
  sourceSets {
    androidTest {
-      java.srcDirs += "$rootDir/core/src/testShared"
+      java.srcDirs += "$rootDir/core/src/sharedTestFunctions/java"
    }
  }
 }
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/KiwixMockServer.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/KiwixMockServer.kt
@ -22,7 +22,7 @@ import okhttp3.mockwebserver.Dispatcher
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
 import okhttp3.mockwebserver.RecordedRequest
-import org.kiwix.kiwixmobile.core.TEST_PORT
+import org.kiwix.sharedFunctions.TEST_PORT
 import org.simpleframework.xml.core.Persister
 import java.io.StringWriter
 import java.util.Stack
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/core/di/modules/TestNetworkModule.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/core/di/modules/TestNetworkModule.kt
@ -19,8 +19,8 @@ package org.kiwix.kiwixmobile.core.di.modules

 import dagger.Module
 import okhttp3.OkHttpClient
-import org.kiwix.kiwixmobile.core.MOCK_BASE_URL
 import org.kiwix.kiwixmobile.core.data.remote.KiwixService
+import org.kiwix.sharedFunctions.MOCK_BASE_URL

 /**
 * Created by mhutti1 on 14/04/17.
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/zim_manager/ZimManageActivityTest.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/zim_manager/ZimManageActivityTest.kt
@ -23,14 +23,14 @@ import androidx.test.filters.SdkSuppress
 import okhttp3.mockwebserver.MockResponse
 import org.junit.Test
 import org.kiwix.kiwixmobile.BaseActivityTest
-import org.kiwix.kiwixmobile.core.CoreApp
-import org.kiwix.kiwixmobile.core.book
-import org.kiwix.kiwixmobile.core.libraryNetworkEntity
-import org.kiwix.kiwixmobile.core.metaLinkNetworkEntity
 import org.kiwix.kiwixmobile.KiwixMockServer
+import org.kiwix.kiwixmobile.core.CoreApp
 import org.kiwix.kiwixmobile.core.data.remote.KiwixService.LIBRARY_NETWORK_PATH
 import org.kiwix.kiwixmobile.core.entity.LibraryNetworkEntity
 import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil
+import org.kiwix.sharedFunctions.book
+import org.kiwix.sharedFunctions.libraryNetworkEntity
+import org.kiwix.sharedFunctions.metaLinkNetworkEntity
 import java.util.concurrent.TimeUnit.SECONDS

@SdkSuppress(minSdkVersion = Build.VERSION_CODES.JELLY_BEAN_MR2)
--- a/app/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/LanguageViewModelTest.kt
+++ b/app/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/LanguageViewModelTest.kt
@ -30,11 +30,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS
 import org.junit.jupiter.api.extension.ExtendWith
-import org.kiwix.kiwixmobile.core.InstantExecutorExtension
 import org.kiwix.kiwixmobile.core.dao.NewLanguagesDao
-import org.kiwix.kiwixmobile.core.language
-import org.kiwix.kiwixmobile.core.resetSchedulers
-import org.kiwix.kiwixmobile.core.setScheduler
 import org.kiwix.kiwixmobile.core.zim_manager.Language
 import org.kiwix.kiwixmobile.language.adapter.LanguageListItem
 import org.kiwix.kiwixmobile.language.viewmodel.Action.Filter
@ -44,6 +40,10 @@ import org.kiwix.kiwixmobile.language.viewmodel.Action.UpdateLanguages
 import org.kiwix.kiwixmobile.language.viewmodel.State.Content
 import org.kiwix.kiwixmobile.language.viewmodel.State.Loading
 import org.kiwix.kiwixmobile.language.viewmodel.State.Saving
+import org.kiwix.sharedFunctions.InstantExecutorExtension
+import org.kiwix.sharedFunctions.resetSchedulers
+import org.kiwix.sharedFunctions.setScheduler
+import org.kiwix.sharedFunctions.language

 fun languageItem(language: Language = language()) =
  LanguageListItem.LanguageItem(language)
--- a/app/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/SaveLanguagesAndFinishTest.kt
+++ b/app/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/SaveLanguagesAndFinishTest.kt
@ -24,9 +24,9 @@ import io.mockk.verify
 import io.reactivex.schedulers.Schedulers
 import org.junit.jupiter.api.Test
 import org.kiwix.kiwixmobile.core.dao.NewLanguagesDao
-import org.kiwix.kiwixmobile.core.resetSchedulers
-import org.kiwix.kiwixmobile.core.setScheduler
 import org.kiwix.kiwixmobile.core.zim_manager.Language
+import org.kiwix.sharedFunctions.resetSchedulers
+import org.kiwix.sharedFunctions.setScheduler

 class SaveLanguagesAndFinishTest {

--- a/app/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/StateTest.kt
+++ b/app/src/test/java/org/kiwix/kiwixmobile/language/viewmodel/StateTest.kt
@ -21,10 +21,10 @@ package org.kiwix.kiwixmobile.language.viewmodel
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
-import org.kiwix.kiwixmobile.core.language
 import org.kiwix.kiwixmobile.language.adapter.LanguageListItem.HeaderItem
 import org.kiwix.kiwixmobile.language.adapter.LanguageListItem.LanguageItem
 import org.kiwix.kiwixmobile.language.viewmodel.State.Content
+import org.kiwix.sharedFunctions.language

 class StateTest {
  @Nested
--- a/app/src/test/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModelTest.kt
+++ b/app/src/test/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModelTest.kt
@ -35,24 +35,15 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS
 import org.junit.jupiter.api.extension.ExtendWith
-import org.kiwix.kiwixmobile.core.InstantExecutorExtension
 import org.kiwix.kiwixmobile.core.R
 import org.kiwix.kiwixmobile.core.StorageObserver
-import org.kiwix.kiwixmobile.core.book
-import org.kiwix.kiwixmobile.core.bookOnDisk
 import org.kiwix.kiwixmobile.core.dao.FetchDownloadDao
 import org.kiwix.kiwixmobile.core.dao.NewBookDao
 import org.kiwix.kiwixmobile.core.dao.NewLanguagesDao
 import org.kiwix.kiwixmobile.core.data.DataSource
 import org.kiwix.kiwixmobile.core.data.remote.KiwixService
-import org.kiwix.kiwixmobile.core.downloadItem
-import org.kiwix.kiwixmobile.core.downloadModel
 import org.kiwix.kiwixmobile.core.downloader.model.DownloadModel
 import org.kiwix.kiwixmobile.core.entity.LibraryNetworkEntity.Book
-import org.kiwix.kiwixmobile.core.language
-import org.kiwix.kiwixmobile.core.libraryNetworkEntity
-import org.kiwix.kiwixmobile.core.resetSchedulers
-import org.kiwix.kiwixmobile.core.setScheduler
 import org.kiwix.kiwixmobile.core.utils.BookUtils
 import org.kiwix.kiwixmobile.core.zim_manager.Language
 import org.kiwix.kiwixmobile.core.zim_manager.fileselect_view.adapter.BooksOnDiskListItem
@ -64,6 +55,15 @@ import org.kiwix.kiwixmobile.zim_manager.NetworkState.CONNECTED
 import org.kiwix.kiwixmobile.zim_manager.NetworkState.NOT_CONNECTED
 import org.kiwix.kiwixmobile.zim_manager.fileselect_view.FileSelectListState
 import org.kiwix.kiwixmobile.zim_manager.library_view.adapter.LibraryListItem
+import org.kiwix.sharedFunctions.InstantExecutorExtension
+import org.kiwix.sharedFunctions.book
+import org.kiwix.sharedFunctions.bookOnDisk
+import org.kiwix.sharedFunctions.downloadItem
+import org.kiwix.sharedFunctions.downloadModel
+import org.kiwix.sharedFunctions.language
+import org.kiwix.sharedFunctions.libraryNetworkEntity
+import org.kiwix.sharedFunctions.resetSchedulers
+import org.kiwix.sharedFunctions.setScheduler
 import java.util.Locale
 import java.util.concurrent.TimeUnit.MILLISECONDS
 import java.util.concurrent.TimeUnit.SECONDS
--- a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
+++ b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
@ -119,7 +119,7 @@ class AllProjectConfigurer {
        exclude("META-INF/ASL2.0")
      }
      sourceSets {
-        getByName("test").java.srcDir("${target.rootDir}/core/src/testShared")
+        getByName("test").java.srcDir("${target.rootDir}/core/src/sharedTestFunctions/java")
      }
    }
  }
--- a/core/src/sharedTestFunctions/java/org/kiwix/sharedFunctions/InstantExecutorExtension.kt
+++ b/core/src/sharedTestFunctions/java/org/kiwix/sharedFunctions/InstantExecutorExtension.kt
@ -16,7 +16,7 @@
 *
 */

-package org.kiwix.kiwixmobile.core
+package org.kiwix.sharedFunctions

 import androidx.arch.core.executor.ArchTaskExecutor
 import androidx.arch.core.executor.TaskExecutor
--- a/core/src/sharedTestFunctions/java/org/kiwix/sharedFunctions/TestConstants.kt
+++ b/core/src/sharedTestFunctions/java/org/kiwix/sharedFunctions/TestConstants.kt
@ -15,7 +15,7 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 *
 */
-package org.kiwix.kiwixmobile.core
+package org.kiwix.sharedFunctions

 const val TEST_PORT = 8080
 const val MOCK_BASE_URL = "http://localhost:$TEST_PORT/"
--- a/core/src/sharedTestFunctions/java/org/kiwix/sharedFunctions/TestModelFunctions.kt
+++ b/core/src/sharedTestFunctions/java/org/kiwix/sharedFunctions/TestModelFunctions.kt
@ -15,7 +15,7 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 *
 */
-package org.kiwix.kiwixmobile.core
+package org.kiwix.sharedFunctions

 import com.tonyodev.fetch2.Error
 import com.tonyodev.fetch2.Status
--- a/core/src/sharedTestFunctions/java/org/kiwix/sharedFunctions/TestUtilitiyFunctions.kt
+++ b/core/src/sharedTestFunctions/java/org/kiwix/sharedFunctions/TestUtilitiyFunctions.kt
@ -15,7 +15,7 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 *
 */
-package org.kiwix.kiwixmobile.core
+package org.kiwix.sharedFunctions

 import io.reactivex.Scheduler
 import io.reactivex.android.plugins.RxAndroidPlugins
--- a/core/src/test/java/org/kiwix/kiwixmobile/core/StorageObserverTest.kt
+++ b/core/src/test/java/org/kiwix/kiwixmobile/core/StorageObserverTest.kt
@ -27,16 +27,16 @@ import io.reactivex.schedulers.Schedulers
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import org.kiwix.kiwixmobile.core.book
-import org.kiwix.kiwixmobile.core.bookOnDisk
 import org.kiwix.kiwixmobile.core.dao.FetchDownloadDao
 import org.kiwix.kiwixmobile.core.downloader.model.DownloadModel
 import org.kiwix.kiwixmobile.core.reader.ZimFileReader
 import org.kiwix.kiwixmobile.core.reader.ZimFileReader.Factory
-import org.kiwix.kiwixmobile.core.resetSchedulers
-import org.kiwix.kiwixmobile.core.setScheduler
 import org.kiwix.kiwixmobile.core.utils.SharedPreferenceUtil
 import org.kiwix.kiwixmobile.core.utils.files.FileSearch
+import org.kiwix.sharedFunctions.book
+import org.kiwix.sharedFunctions.bookOnDisk
+import org.kiwix.sharedFunctions.resetSchedulers
+import org.kiwix.sharedFunctions.setScheduler
 import java.io.File

 class StorageObserverTest {
--- a/core/src/test/java/org/kiwix/kiwixmobile/core/utils/files/FileSearchTest.kt
+++ b/core/src/test/java/org/kiwix/kiwixmobile/core/utils/files/FileSearchTest.kt
@ -35,8 +35,8 @@ import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
-import org.kiwix.kiwixmobile.core.resetSchedulers
-import org.kiwix.kiwixmobile.core.setScheduler
+import org.kiwix.sharedFunctions.resetSchedulers
+import org.kiwix.sharedFunctions.setScheduler
 import java.io.File

 class FileSearchTest {
--- a/core/src/test/java/org/kiwix/kiwixmobile/core/zim_manager/LanguageTest.kt
+++ b/core/src/test/java/org/kiwix/kiwixmobile/core/zim_manager/LanguageTest.kt
@ -40,7 +40,7 @@ import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Assertions.assertThrows
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
-import org.kiwix.kiwixmobile.core.language
+import org.kiwix.sharedFunctions.language

 class LanguageTest {