diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index b95f97c4a..91ba7c79a 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,8 +1,6 @@ -# Team Lead -* @Tuubz - -# Team Members -* @AVI5HEK @chornerman @doannimble @hoangnguyen92dn @kaungkhantsoe @luongvo @lydiasama @manh-t @minhnimble @ryan-conway @sleepylee @Wadeewee +# Team +# @Tuubz is the Team Lead and the others are team members +* @AVI5HEK @chornerman @doannimble @hoangnguyen92dn @kaungkhantsoe @luongvo @lydiasama @manh-t @minhnimble @ryan-conway @sleepylee @Tuubz @Wadeewee # Engineering Leads CODEOWNERS @nimblehq/engineering-leads diff --git a/.github/workflows/review_pull_request.yml b/.github/workflows/review_pull_request.yml index 5b9f1c3e7..f3a10be29 100644 --- a/.github/workflows/review_pull_request.yml +++ b/.github/workflows/review_pull_request.yml @@ -33,21 +33,12 @@ jobs: working-directory: ./CoroutineTemplate run: ./gradlew detekt - - name: Run Detekt on RxJavaTemplate - working-directory: ./RxJavaTemplate - run: ./gradlew detekt - - - name: Run Android Lint on RxJavaTemplate - working-directory: ./RxJavaTemplate - run: ./gradlew lint - - name: Run Android Lint on CoroutineTemplate working-directory: ./CoroutineTemplate run: ./gradlew lint - # TODO: Update to support test coverage reports from Jacoco for CoroutineTemplate - - name: Run unit tests and Jacoco on RxJavaTemplate - working-directory: ./RxJavaTemplate + - name: Run unit tests and Jacoco on CoroutineTemplate + working-directory: ./CoroutineTemplate run: ./gradlew jacocoTestReport - name: Set up Ruby diff --git a/.github/workflows/run_detekt_and_unit_tests.yml b/.github/workflows/run_detekt_and_unit_tests.yml index 75dde8f87..29f78f30c 100644 --- a/.github/workflows/run_detekt_and_unit_tests.yml +++ b/.github/workflows/run_detekt_and_unit_tests.yml @@ -31,30 +31,18 @@ jobs: working-directory: ./CoroutineTemplate run: ./gradlew detekt - - name: Run Detekt on RxJavaTemplate - working-directory: ./RxJavaTemplate - run: ./gradlew detekt - - name: Archive Detekt reports on CoroutineTemplate uses: actions/upload-artifact@v2 with: name: DetektReportsCoroutine path: CoroutineTemplate/build/reports/detekt/ - - name: Archive Detekt reports on RxJavaTemplate - uses: actions/upload-artifact@v2 - with: - name: DetektReportsRxJava - path: RxJavaTemplate/build/reports/detekt/ - - - name: Run unit tests and Jacoco on RxJavaTemplate - working-directory: ./RxJavaTemplate + - name: Run unit tests and Jacoco on CoroutineTemplate + working-directory: ./CoroutineTemplate run: ./gradlew jacocoTestReport - - name: Archive code coverage reports on RxJavaTemplate + - name: Archive code coverage reports on CoroutineTemplate uses: actions/upload-artifact@v2 with: - name: CodeCoverageReportsRxJava - path: | - RxJavaTemplate/app/build/reports/jacoco/jacocoTestReport/ - RxJavaTemplate/data/build/reports/jacoco/jacocoTestReport/ + name: CodeCoverageReportsCoroutine + path: CoroutineTemplate/app/build/reports/jacoco/jacocoTestReport/ diff --git a/.gitignore b/.gitignore index 4fbb202c3..5be5842aa 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ .idea .gradle /CoroutineTemplate/local.properties -/RxJavaTemplate/local.properties +/RxJavaTemplate[DEPRECATED]/local.properties .DS_Store build/ /captures diff --git a/CoroutineTemplate/.gitignore b/CoroutineTemplate/.gitignore index adf3f6e6e..aa6c24c38 100644 --- a/CoroutineTemplate/.gitignore +++ b/CoroutineTemplate/.gitignore @@ -42,3 +42,11 @@ secret/ # External native build folder generated in Android Studio 2.2 and later .externalNativeBuild + +# Code coverage +jacoco.exec + +# Google services +google-services.json +# Keystore +config/release.keystore diff --git a/CoroutineTemplate/README.md b/CoroutineTemplate/README.md index e54413e27..628857310 100644 --- a/CoroutineTemplate/README.md +++ b/CoroutineTemplate/README.md @@ -1,25 +1,51 @@ # Android Templates: Coroutine + - Our optimized Android templates used in our android projects -### Setup +## Setup + - Clone the project -- Checkout our main development branch `kotlin` - Run the project with Android Studio -### Linter and static code analysis +## Linter and static code analysis -1. Check Style: +- Lint: ``` -$ ./gradlew checkStyle +$ ./gradlew lint ``` -Report is located at: `./app/build/reports/checkstyle/` +Report is located at: `./app/build/reports/lint/` -2. Detekt +- Detekt ``` $ ./gradlew detekt ``` -Report is located at: `./build/reports/detekt.html` +Report is located at: `./build/reports/detekt` + +## Testing + +- Run unit testing: + +``` +$ ./gradlew app:testStagingDebugUnitTest +$ ./gradlew data:testDebugUnitTest +$ ./gradlew domain:test +``` + +- Run unit testing with coverage: + +``` +$ ./gradlew jacocoTestReport +``` + +Report is located at: `./app/build/reports/jacoco/` + +## Build and deploy + +For `release` builds, we need to provide release keystore and signing properties: + +- Put the `release.keystore` file at root `config` folder. +- Put keystore signing properties in [signing.properties](https://github.com/nimblehq/android-templates/blob/develop/CoroutineTemplate/signing.properties). diff --git a/CoroutineTemplate/app/build.gradle.kts b/CoroutineTemplate/app/build.gradle.kts index eabe1fefa..4e3e10040 100644 --- a/CoroutineTemplate/app/build.gradle.kts +++ b/CoroutineTemplate/app/build.gradle.kts @@ -7,19 +7,28 @@ plugins { id("dagger.hilt.android.plugin") id("androidx.navigation.safeargs.kotlin") + + id("plugins.jacoco-report") } val keystoreProperties = rootDir.loadGradleProperties("signing.properties") android { signingConfigs { - create("config") { + create(BuildType.RELEASE) { // Remember to edit signing.properties to have the correct info for release build. - storeFile = file("../keystore_production") + storeFile = file("../config/release.keystore") storePassword = keystoreProperties.getProperty("KEYSTORE_PASSWORD") as String keyPassword = keystoreProperties.getProperty("KEY_PASSWORD") as String keyAlias = keystoreProperties.getProperty("KEY_ALIAS") as String } + + getByName(BuildType.DEBUG) { + storeFile = file("../config/debug.keystore") + storePassword = "oQ4mL1jY2uX7wD8q" + keyAlias = "debug-key-alias" + keyPassword = "oQ4mL1jY2uX7wD8q" + } } compileSdk = Versions.ANDROID_COMPILE_SDK_VERSION @@ -37,13 +46,23 @@ android { isDebuggable = false isShrinkResources = true proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro") - signingConfig = signingConfigs["config"] + signingConfig = signingConfigs[BuildType.RELEASE] buildConfigField("String", "BASE_API_URL", "\"https://jsonplaceholder.typicode.com/\"") } + getByName(BuildType.DEBUG) { // For quickly testing build with proguard, enable this isMinifyEnabled = false + signingConfig = signingConfigs[BuildType.DEBUG] buildConfigField("String", "BASE_API_URL", "\"https://jsonplaceholder.typicode.com/\"") + /** + * From AGP 4.2.0, Jacoco generates the report incorrectly, and the report is missing + * some code coverage from module. On the new version of Gradle, they introduce a new + * flag [testCoverageEnabled], we must enable this flag if using Jacoco to capture + * coverage and creates a report in the build directory. + * Reference: https://developer.android.com/reference/tools/gradle-api/7.1/com/android/build/api/dsl/BuildType#istestcoverageenabled + */ + isTestCoverageEnabled = true } } diff --git a/CoroutineTemplate/app/config/checkstyle.xml b/CoroutineTemplate/app/config/checkstyle.xml deleted file mode 100644 index 9af38f4ec..000000000 --- a/CoroutineTemplate/app/config/checkstyle.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CoroutineTemplate/app/config/xsl/checkstyle-custom.xsl b/CoroutineTemplate/app/config/xsl/checkstyle-custom.xsl deleted file mode 100644 index 87d5726ad..000000000 --- a/CoroutineTemplate/app/config/xsl/checkstyle-custom.xsl +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - Sun Coding Style Violations - - -

- Coding Style Check Results -

- - - - - - - - - - - - - - - - - - - - -
- Summary -
Total files checked - -
Files with errors - -
Total errors - -
Errors per file - -
-
-

The following are violations of the Sun Coding-Style Standards:

-

- - - - - - - - - - - -
File: - -
- - - - - - -
Line NumberError Message
-

- - - - - - - - - - - - - - diff --git a/CoroutineTemplate/app/src/main/java/co/nimblehq/coroutine/di/modules/FragmentComponentsModule.kt b/CoroutineTemplate/app/src/main/java/co/nimblehq/coroutine/di/modules/NavigatorModule.kt similarity index 100% rename from CoroutineTemplate/app/src/main/java/co/nimblehq/coroutine/di/modules/FragmentComponentsModule.kt rename to CoroutineTemplate/app/src/main/java/co/nimblehq/coroutine/di/modules/NavigatorModule.kt diff --git a/CoroutineTemplate/app/src/main/java/co/nimblehq/coroutine/di/modules/RepositoryModule.kt b/CoroutineTemplate/app/src/main/java/co/nimblehq/coroutine/di/modules/RepositoryModule.kt index e177a4080..ac8f63742 100644 --- a/CoroutineTemplate/app/src/main/java/co/nimblehq/coroutine/di/modules/RepositoryModule.kt +++ b/CoroutineTemplate/app/src/main/java/co/nimblehq/coroutine/di/modules/RepositoryModule.kt @@ -1,8 +1,8 @@ package co.nimblehq.coroutine.di.modules +import co.nimblehq.coroutine.data.repository.UserRepositoryImpl import co.nimblehq.coroutine.data.service.ApiService import co.nimblehq.coroutine.domain.repository.UserRepository -import co.nimblehq.coroutine.data.repositoryimpl.UserRepositoryImpl import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/CoroutineTemplate/build.gradle.kts b/CoroutineTemplate/build.gradle.kts index 45250dd0d..a7cb0caad 100644 --- a/CoroutineTemplate/build.gradle.kts +++ b/CoroutineTemplate/build.gradle.kts @@ -37,6 +37,12 @@ tasks.withType().configureEach { detekt { toolVersion = Versions.DETEKT_VERSION + source = files( + "app/src/main/java", + "data/src/main/java", + "domain/src/main/java", + "buildSrc/src/main/java" + ) parallel = false config = files("detekt-config.yml") buildUponDefaultConfig = false diff --git a/CoroutineTemplate/buildSrc/src/main/java/Versions.kt b/CoroutineTemplate/buildSrc/src/main/java/Versions.kt index 4d95e7a34..9c7f5ebd8 100644 --- a/CoroutineTemplate/buildSrc/src/main/java/Versions.kt +++ b/CoroutineTemplate/buildSrc/src/main/java/Versions.kt @@ -6,7 +6,7 @@ object Versions { const val ANDROID_TARGET_SDK_VERSION = 30 const val ANDROID_VERSION_CODE = 1 - const val ANDROID_VERSION_NAME = "3.6.0" + const val ANDROID_VERSION_NAME = "3.7.0" // Dependencies (Alphabet sorted) const val ANDROID_COMMON_KTX_VERSION = "0.1.1" @@ -24,6 +24,7 @@ object Versions { const val HILT_VERSION = "2.38.1" const val JAVAX_INJECT_VERSION = "1" + const val JACOCO_VERSION = "0.8.7" const val KOTLIN_REFLECT_VERSION = "1.5.10" const val KOTLIN_VERSION = "1.5.21" @@ -37,7 +38,7 @@ object Versions { const val TIMBER_LOG_VERSION = "4.7.1" // Configuration - const val DETEKT_VERSION = "1.18.1" + const val DETEKT_VERSION = "1.20.0" // Testing libraries const val TEST_JUNIT_ANDROIDX_EXT_VERSION = "1.1.2" diff --git a/CoroutineTemplate/buildSrc/src/main/java/plugins/jacoco-report.gradle.kts b/CoroutineTemplate/buildSrc/src/main/java/plugins/jacoco-report.gradle.kts new file mode 100644 index 000000000..d4e32fb88 --- /dev/null +++ b/CoroutineTemplate/buildSrc/src/main/java/plugins/jacoco-report.gradle.kts @@ -0,0 +1,142 @@ +package plugins + +plugins { + jacoco +} + +jacoco { + toolVersion = Versions.JACOCO_VERSION +} + +val fileGenerated = setOf( + "**/R.class", + "**/R\$*.class", + "**/*\$ViewBinder*.*", + "**/*\$InjectAdapter*.*", + "**/*Injector*.*", + "**/BuildConfig.*", + "**/Manifest*.*", + "**/*_ViewBinding*.*", + "**/*Adapter*.*", + "**/*Test*.*", + // Enum + "**/*\$Creator*", + // Nav Component + "**/*_Factory*", + "**/*FragmentArgs*", + "**/*FragmentDirections*", + "**/FragmentNavArgsLazy.kt", + "**/*Fragment*navArgs*", + "**/*ModuleDeps*.*", + "**/*NavGraphDirections*", + // Hilt + "**/*_ComponentTreeDeps*", + "**/*_HiltComponents*", + "**/*_HiltModules*", + "**/Hilt_*" +) + +val packagesExcluded = setOf( + "**/com/bumptech/glide", + "**/dagger/hilt/internal", + "**/hilt_aggregated_deps", + "**/co/nimblehq/coroutine/databinding/**", + "**/co/nimblehq/coroutine/di/**" +) + +val fileFilter = fileGenerated + packagesExcluded + +val classDirectoriesTree = files( + fileTree(project.rootDir) { + include( + "**/app/build/intermediates/javac/stagingDebug/classes/**", + "**/data/build/intermediates/javac/debug/classes/**", + "**/app/build/tmp/kotlin-classes/stagingDebug/**", + "**/data/build/tmp/kotlin-classes/debug/**", + "**/domain/build/classes/kotlin/main/**" + ) + exclude(fileFilter) + } +) + +val sourceDirectoriesTree = files( + listOf( + "${project.rootDir}/app/src/main/java", + "${project.rootDir}/data/src/main/java", + "${project.rootDir}/domain/src/main/java" + ) +) + +/** + * Once enabled [testCoverageEnabled], Jacoco will capture the coverage and store them in + * [${project.module}/jacoco.exec]. We need to add all [jacoco.exec] to here. + * [${project.module}/build/jacoco/testFlavorDebugTest.exec] won't have the result anymore, so we + * can safety get rid of them. + * Reference: https://stackoverflow.com/a/67626100/5187859 + * Issue tracker 1: https://issuetracker.google.com/issues/171125857#comment20 + * Issue tracker 2: https://issuetracker.google.com/issues/195860510 + */ +val executionDataTree = fileTree(project.rootDir) { + include( + "app/jacoco.exec", + "data/jacoco.exec", + "domain/build/jacoco/test.exec" + ) +} + +tasks.register("jacocoTestReport") { + group = "Reporting" + description = "Generate Jacoco coverage reports for Debug build" + + dependsOn( + ":app:testStagingDebugUnitTest", + ":data:testDebugUnitTest", + ":domain:test" + ) + + classDirectories.setFrom(classDirectoriesTree) + sourceDirectories.setFrom(sourceDirectoriesTree) + executionData.setFrom(executionDataTree) + + reports { + xml.isEnabled = true + html.isEnabled = true + csv.isEnabled = false + } +} + +tasks.withType { + configure { + isIncludeNoLocationClasses = true + /* + * From AGP 4.2, JDK 11 is now bundled, but Jacoco is running on JDK 8. It causes the + * build failed because of the missing of some classes that do not exist on JDK 8 but + * JDK 11. We need to exclude that classes temporarily until Jacoco supports running + * on JDK 11. + * Android Gradle Plugin 4.2.0 release note: https://developer.android.com/studio/releases#4.2-bundled-jdk-11 + * Reference: https://stackoverflow.com/a/68739364/5187859 + */ + excludes = listOf("jdk.internal.*") + } +} + +/** + * Workaround to bypass "Caused by: java.lang.IllegalStateException: + * Cannot process instrumented class... + * Please supply original non-instrumented classes." issue. + * + * Application projects that depend on variants of libraries that have test coverage enabled will + * still not work as app code should be instrumented on the fly, while library code should not be. + * https://issuetracker.google.com/issues/171125857#comment26 + */ +tasks.withType().configureEach { + configure { + includes = listOf("com.application.*") // include only application classes + } +} + +tasks.withType { + testLogging { + events("passed", "skipped", "failed") + } +} diff --git a/CoroutineTemplate/config/debug.keystore b/CoroutineTemplate/config/debug.keystore new file mode 100644 index 000000000..930eba409 Binary files /dev/null and b/CoroutineTemplate/config/debug.keystore differ diff --git a/CoroutineTemplate/data/build.gradle.kts b/CoroutineTemplate/data/build.gradle.kts index fedc848ef..c6b13c214 100644 --- a/CoroutineTemplate/data/build.gradle.kts +++ b/CoroutineTemplate/data/build.gradle.kts @@ -1,6 +1,8 @@ plugins { id("com.android.library") id("kotlin-android") + + id("plugins.jacoco-report") } android { @@ -20,6 +22,17 @@ android { isMinifyEnabled = false proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro") } + + getByName(BuildType.DEBUG) { + /** + * From AGP 4.2.0, Jacoco generates the report incorrectly, and the report is missing + * some code coverage from module. On the new version of Gradle, they introduce a new + * flag [testCoverageEnabled], we must enable this flag if using Jacoco to capture + * coverage and creates a report in the build directory. + * Reference: https://developer.android.com/reference/tools/gradle-api/7.1/com/android/build/api/dsl/BuildType#istestcoverageenabled + */ + isTestCoverageEnabled = true + } } compileOptions { @@ -56,4 +69,10 @@ dependencies { api("com.squareup.okhttp3:okhttp:${Versions.OKHTTP_VERSION}") api("com.squareup.okhttp3:logging-interceptor:${Versions.OKHTTP_VERSION}") + + // Testing + testImplementation("junit:junit:${Versions.TEST_JUNIT_VERSION}") + testImplementation("io.mockk:mockk:${Versions.TEST_MOCKK_VERSION}") + testImplementation("io.kotest:kotest-assertions-core:${Versions.TEST_KOTEST_VERSION}") + testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:${Versions.KOTLINX_COROUTINES_VERSION}") } diff --git a/CoroutineTemplate/data/src/main/java/co/nimblehq/coroutine/data/repositoryimpl/UserRepository.kt b/CoroutineTemplate/data/src/main/java/co/nimblehq/coroutine/data/repository/UserRepositoryImpl.kt similarity index 89% rename from CoroutineTemplate/data/src/main/java/co/nimblehq/coroutine/data/repositoryimpl/UserRepository.kt rename to CoroutineTemplate/data/src/main/java/co/nimblehq/coroutine/data/repository/UserRepositoryImpl.kt index 2131042e3..17b0ac7d3 100644 --- a/CoroutineTemplate/data/src/main/java/co/nimblehq/coroutine/data/repositoryimpl/UserRepository.kt +++ b/CoroutineTemplate/data/src/main/java/co/nimblehq/coroutine/data/repository/UserRepositoryImpl.kt @@ -1,9 +1,9 @@ -package co.nimblehq.coroutine.data.repositoryimpl +package co.nimblehq.coroutine.data.repository +import co.nimblehq.coroutine.data.response.toUsers import co.nimblehq.coroutine.data.service.ApiService import co.nimblehq.coroutine.domain.model.User import co.nimblehq.coroutine.domain.repository.UserRepository -import co.nimblehq.coroutine.data.response.toUsers class UserRepositoryImpl constructor( private val apiService: ApiService diff --git a/CoroutineTemplate/data/src/test/java/co/nimblehq/coroutine/data/repository/UserRepositoryTest.kt b/CoroutineTemplate/data/src/test/java/co/nimblehq/coroutine/data/repository/UserRepositoryTest.kt new file mode 100644 index 000000000..76b8c5a84 --- /dev/null +++ b/CoroutineTemplate/data/src/test/java/co/nimblehq/coroutine/data/repository/UserRepositoryTest.kt @@ -0,0 +1,53 @@ +package co.nimblehq.coroutine.data.repository + +import co.nimblehq.coroutine.data.response.UserResponse +import co.nimblehq.coroutine.data.response.toUsers +import co.nimblehq.coroutine.data.service.ApiService +import co.nimblehq.coroutine.domain.repository.UserRepository +import io.kotest.assertions.throwables.shouldThrow +import io.kotest.matchers.shouldBe +import io.mockk.coEvery +import io.mockk.mockk +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.runBlockingTest +import org.junit.Before +import org.junit.Test + +@ExperimentalCoroutinesApi +class UserRepositoryTest { + + private lateinit var mockService: ApiService + private lateinit var repository: UserRepository + + private val userResponse = UserResponse( + id = 1, + name = "name", + username = "username", + email = "email", + addressResponse = null, + phone = null, + website = null + ) + + @Before + fun setup() { + mockService = mockk() + repository = UserRepositoryImpl(mockService) + } + + @Test + fun `When calling getUsers request successfully, it returns success response`() = runBlockingTest { + coEvery { mockService.getUsers() } returns listOf(userResponse) + + repository.getUsers() shouldBe listOf(userResponse).toUsers() + } + + @Test + fun `When calling getUsers request failed, it returns wrapped error`() = runBlockingTest { + coEvery { mockService.getUsers() } throws Throwable() + + shouldThrow { + repository.getUsers() + } + } +} diff --git a/CoroutineTemplate/domain/build.gradle.kts b/CoroutineTemplate/domain/build.gradle.kts index 5c9f654e5..4d57eadf1 100644 --- a/CoroutineTemplate/domain/build.gradle.kts +++ b/CoroutineTemplate/domain/build.gradle.kts @@ -1,6 +1,8 @@ plugins { id("java-library") id("kotlin") + + jacoco } java { @@ -10,4 +12,10 @@ java { dependencies { implementation("javax.inject:javax.inject:${Versions.JAVAX_INJECT_VERSION}") + + // Testing + testImplementation("junit:junit:${Versions.TEST_JUNIT_VERSION}") + testImplementation("io.mockk:mockk:${Versions.TEST_MOCKK_VERSION}") + testImplementation("io.kotest:kotest-assertions-core:${Versions.TEST_KOTEST_VERSION}") + testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:${Versions.KOTLINX_COROUTINES_VERSION}") } diff --git a/CoroutineTemplate/domain/src/test/java/co/nimblehq/coroutine/domain/usecase/GetUsersUseCaseTest.kt b/CoroutineTemplate/domain/src/test/java/co/nimblehq/coroutine/domain/usecase/GetUsersUseCaseTest.kt new file mode 100644 index 000000000..9b46cc64a --- /dev/null +++ b/CoroutineTemplate/domain/src/test/java/co/nimblehq/coroutine/domain/usecase/GetUsersUseCaseTest.kt @@ -0,0 +1,54 @@ +package co.nimblehq.coroutine.domain.usecase + +import co.nimblehq.coroutine.domain.model.User +import co.nimblehq.coroutine.domain.repository.UserRepository +import io.kotest.matchers.shouldBe +import io.mockk.coEvery +import io.mockk.mockk +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.runBlockingTest +import org.junit.Before +import org.junit.Test + +@ExperimentalCoroutinesApi +class GetUsersUseCaseTest { + + private lateinit var mockRepository: UserRepository + private lateinit var usecase: GetUsersUseCase + + private val user = User( + id = 1, + name = "name", + username = "username", + email = "email", + address = null, + phone = "", + website = "" + ) + + @Before + fun setup() { + mockRepository = mockk() + usecase = GetUsersUseCase(mockRepository) + } + + @Test + fun `When calling request successfully, it returns success response`() = runBlockingTest { + val expected = listOf(user) + coEvery { mockRepository.getUsers() } returns expected + + usecase.execute().run { + (this as UseCaseResult.Success).data shouldBe expected + } + } + + @Test + fun `When calling request failed, it returns wrapped error`() = runBlockingTest { + val expected = Exception() + coEvery { mockRepository.getUsers() } throws expected + + usecase.execute().run { + (this as UseCaseResult.Error).exception shouldBe expected + } + } +} diff --git a/Dangerfile b/Dangerfile index 5a3f34b38..11e20dbc4 100644 --- a/Dangerfile +++ b/Dangerfile @@ -29,10 +29,9 @@ Dir[lint_dir].each do |file_name| android_lint.lint(inline_mode: true) end -# TODO: Update to support test coverage report from Jacoco for Coroutine Template -# Show Danger test coverage report from Jacoco for RxJavaTemplate -jacoco_dir = "RxJavaTemplate/**/build/reports/jacoco/jacocoTestReport/jacocoTestReport.xml" -markdown "## RxJavaTemplate Jacoco report:" +# Show Danger test coverage report from Jacoco for CoroutineTemplate +jacoco_dir = "CoroutineTemplate/**/build/reports/jacoco/jacocoTestReport/jacocoTestReport.xml" +markdown "## CoroutineTemplate Jacoco report:" Dir[jacoco_dir].each do |file_name| # Report coverage of modified files, warn if total project coverage is under 80% # or if any modified file's coverage is under 95% diff --git a/Gemfile.lock b/Gemfile.lock index 264f8e5ca..31f81edd0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -68,9 +68,9 @@ GEM multipart-post (2.1.1) nap (1.1.0) no_proxy_fix (0.1.2) - nokogiri (1.13.3-x86_64-darwin) + nokogiri (1.13.4-x86_64-darwin) racc (~> 1.4) - nokogiri (1.13.3-x86_64-linux) + nokogiri (1.13.4-x86_64-linux) racc (~> 1.4) octokit (4.21.0) faraday (>= 0.9) diff --git a/README.md b/README.md index 2078d3e6f..1444f4264 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ A collection of templates: * **[CoroutineTemplate](https://github.com/nimblehq/android-templates/tree/kotlin/CoroutineTemplate)** -* **[RxJavaTemplate](https://github.com/nimblehq/android-templates/tree/kotlin/RxJavaTemplate)** +* **[RxJavaTemplate[DEPRECATED]](https://github.com/nimblehq/android-templates/tree/kotlin/RxJavaTemplate)** ## Setup @@ -29,7 +29,7 @@ Example: `./newproject.sh -t crt -p co.myproject.example -n "My Project"` 3. Update `android_version_code` and `android_version_name` - - `RxJavaTemplate/build.gradle` + - `RxJavaTemplate[DEPRECATED]/build.gradle` - `CoroutineTemplate/build.gradle` ## About diff --git a/RxJavaTemplate/app/.gitignore b/RxJavaTemplate/app/.gitignore deleted file mode 100644 index c00d922bb..000000000 --- a/RxJavaTemplate/app/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/build -jacoco.exec diff --git a/RxJavaTemplate/data/.gitignore b/RxJavaTemplate/data/.gitignore deleted file mode 100644 index c00d922bb..000000000 --- a/RxJavaTemplate/data/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/build -jacoco.exec diff --git a/RxJavaTemplate/.gitignore b/RxJavaTemplate[DEPRECATED]/.gitignore similarity index 96% rename from RxJavaTemplate/.gitignore rename to RxJavaTemplate[DEPRECATED]/.gitignore index 831144f55..197905957 100644 --- a/RxJavaTemplate/.gitignore +++ b/RxJavaTemplate[DEPRECATED]/.gitignore @@ -55,3 +55,6 @@ freeline_project_description.json # Fastlane fastlane/report.xml + +# Code coverage +jacoco.exec diff --git a/RxJavaTemplate/Gemfile b/RxJavaTemplate[DEPRECATED]/Gemfile similarity index 100% rename from RxJavaTemplate/Gemfile rename to RxJavaTemplate[DEPRECATED]/Gemfile diff --git a/RxJavaTemplate/Gemfile.lock b/RxJavaTemplate[DEPRECATED]/Gemfile.lock similarity index 100% rename from RxJavaTemplate/Gemfile.lock rename to RxJavaTemplate[DEPRECATED]/Gemfile.lock diff --git a/RxJavaTemplate/README.md b/RxJavaTemplate[DEPRECATED]/README.md similarity index 100% rename from RxJavaTemplate/README.md rename to RxJavaTemplate[DEPRECATED]/README.md diff --git a/RxJavaTemplate/common-rx/.gitignore b/RxJavaTemplate[DEPRECATED]/app/.gitignore similarity index 100% rename from RxJavaTemplate/common-rx/.gitignore rename to RxJavaTemplate[DEPRECATED]/app/.gitignore diff --git a/RxJavaTemplate/app/build.gradle.kts b/RxJavaTemplate[DEPRECATED]/app/build.gradle.kts similarity index 100% rename from RxJavaTemplate/app/build.gradle.kts rename to RxJavaTemplate[DEPRECATED]/app/build.gradle.kts diff --git a/RxJavaTemplate/app/codequality.gradle.kts b/RxJavaTemplate[DEPRECATED]/app/codequality.gradle.kts similarity index 100% rename from RxJavaTemplate/app/codequality.gradle.kts rename to RxJavaTemplate[DEPRECATED]/app/codequality.gradle.kts diff --git a/RxJavaTemplate/app/config/checkstyle.xml b/RxJavaTemplate[DEPRECATED]/app/config/checkstyle.xml similarity index 100% rename from RxJavaTemplate/app/config/checkstyle.xml rename to RxJavaTemplate[DEPRECATED]/app/config/checkstyle.xml diff --git a/RxJavaTemplate/app/config/xsl/checkstyle-custom.xsl b/RxJavaTemplate[DEPRECATED]/app/config/xsl/checkstyle-custom.xsl similarity index 100% rename from RxJavaTemplate/app/config/xsl/checkstyle-custom.xsl rename to RxJavaTemplate[DEPRECATED]/app/config/xsl/checkstyle-custom.xsl diff --git a/RxJavaTemplate/app/proguard-rules.pro b/RxJavaTemplate[DEPRECATED]/app/proguard-rules.pro similarity index 100% rename from RxJavaTemplate/app/proguard-rules.pro rename to RxJavaTemplate[DEPRECATED]/app/proguard-rules.pro diff --git a/RxJavaTemplate/app/src/androidTest/java/co/nimblehq/rxjava/TestRunner.kt b/RxJavaTemplate[DEPRECATED]/app/src/androidTest/java/co/nimblehq/rxjava/TestRunner.kt similarity index 100% rename from RxJavaTemplate/app/src/androidTest/java/co/nimblehq/rxjava/TestRunner.kt rename to RxJavaTemplate[DEPRECATED]/app/src/androidTest/java/co/nimblehq/rxjava/TestRunner.kt diff --git a/RxJavaTemplate/app/src/androidTest/java/co/nimblehq/rxjava/di/modules/TestRepositoryModule.kt b/RxJavaTemplate[DEPRECATED]/app/src/androidTest/java/co/nimblehq/rxjava/di/modules/TestRepositoryModule.kt similarity index 100% rename from RxJavaTemplate/app/src/androidTest/java/co/nimblehq/rxjava/di/modules/TestRepositoryModule.kt rename to RxJavaTemplate[DEPRECATED]/app/src/androidTest/java/co/nimblehq/rxjava/di/modules/TestRepositoryModule.kt diff --git a/RxJavaTemplate/app/src/androidTest/java/co/nimblehq/rxjava/repository/TestApiRepositoryImpl.kt b/RxJavaTemplate[DEPRECATED]/app/src/androidTest/java/co/nimblehq/rxjava/repository/TestApiRepositoryImpl.kt similarity index 100% rename from RxJavaTemplate/app/src/androidTest/java/co/nimblehq/rxjava/repository/TestApiRepositoryImpl.kt rename to RxJavaTemplate[DEPRECATED]/app/src/androidTest/java/co/nimblehq/rxjava/repository/TestApiRepositoryImpl.kt diff --git a/RxJavaTemplate/app/src/androidTest/java/co/nimblehq/rxjava/ui/common/TestUtil.kt b/RxJavaTemplate[DEPRECATED]/app/src/androidTest/java/co/nimblehq/rxjava/ui/common/TestUtil.kt similarity index 100% rename from RxJavaTemplate/app/src/androidTest/java/co/nimblehq/rxjava/ui/common/TestUtil.kt rename to RxJavaTemplate[DEPRECATED]/app/src/androidTest/java/co/nimblehq/rxjava/ui/common/TestUtil.kt diff --git a/RxJavaTemplate/app/src/androidTest/java/co/nimblehq/rxjava/ui/flow/AppFlowTest.kt b/RxJavaTemplate[DEPRECATED]/app/src/androidTest/java/co/nimblehq/rxjava/ui/flow/AppFlowTest.kt similarity index 100% rename from RxJavaTemplate/app/src/androidTest/java/co/nimblehq/rxjava/ui/flow/AppFlowTest.kt rename to RxJavaTemplate[DEPRECATED]/app/src/androidTest/java/co/nimblehq/rxjava/ui/flow/AppFlowTest.kt diff --git a/RxJavaTemplate/app/src/androidTest/java/co/nimblehq/rxjava/ui/screens/home/Home.kt b/RxJavaTemplate[DEPRECATED]/app/src/androidTest/java/co/nimblehq/rxjava/ui/screens/home/Home.kt similarity index 100% rename from RxJavaTemplate/app/src/androidTest/java/co/nimblehq/rxjava/ui/screens/home/Home.kt rename to RxJavaTemplate[DEPRECATED]/app/src/androidTest/java/co/nimblehq/rxjava/ui/screens/home/Home.kt diff --git a/RxJavaTemplate/app/src/androidTest/java/co/nimblehq/rxjava/ui/screens/home/HomeFragmentTest.kt b/RxJavaTemplate[DEPRECATED]/app/src/androidTest/java/co/nimblehq/rxjava/ui/screens/home/HomeFragmentTest.kt similarity index 100% rename from RxJavaTemplate/app/src/androidTest/java/co/nimblehq/rxjava/ui/screens/home/HomeFragmentTest.kt rename to RxJavaTemplate[DEPRECATED]/app/src/androidTest/java/co/nimblehq/rxjava/ui/screens/home/HomeFragmentTest.kt diff --git a/RxJavaTemplate/app/src/androidTest/java/co/nimblehq/rxjava/ui/screens/second/Second.kt b/RxJavaTemplate[DEPRECATED]/app/src/androidTest/java/co/nimblehq/rxjava/ui/screens/second/Second.kt similarity index 100% rename from RxJavaTemplate/app/src/androidTest/java/co/nimblehq/rxjava/ui/screens/second/Second.kt rename to RxJavaTemplate[DEPRECATED]/app/src/androidTest/java/co/nimblehq/rxjava/ui/screens/second/Second.kt diff --git a/RxJavaTemplate/app/src/androidTest/java/co/nimblehq/rxjava/ui/screens/second/SecondFragmentTest.kt b/RxJavaTemplate[DEPRECATED]/app/src/androidTest/java/co/nimblehq/rxjava/ui/screens/second/SecondFragmentTest.kt similarity index 100% rename from RxJavaTemplate/app/src/androidTest/java/co/nimblehq/rxjava/ui/screens/second/SecondFragmentTest.kt rename to RxJavaTemplate[DEPRECATED]/app/src/androidTest/java/co/nimblehq/rxjava/ui/screens/second/SecondFragmentTest.kt diff --git a/RxJavaTemplate/app/src/androidTest/java/co/nimblehq/rxjava/ui/screens/webview/WebView.kt b/RxJavaTemplate[DEPRECATED]/app/src/androidTest/java/co/nimblehq/rxjava/ui/screens/webview/WebView.kt similarity index 100% rename from RxJavaTemplate/app/src/androidTest/java/co/nimblehq/rxjava/ui/screens/webview/WebView.kt rename to RxJavaTemplate[DEPRECATED]/app/src/androidTest/java/co/nimblehq/rxjava/ui/screens/webview/WebView.kt diff --git a/RxJavaTemplate/app/src/androidTest/java/co/nimblehq/rxjava/ui/screens/webview/WebViewFragmentTest.kt b/RxJavaTemplate[DEPRECATED]/app/src/androidTest/java/co/nimblehq/rxjava/ui/screens/webview/WebViewFragmentTest.kt similarity index 100% rename from RxJavaTemplate/app/src/androidTest/java/co/nimblehq/rxjava/ui/screens/webview/WebViewFragmentTest.kt rename to RxJavaTemplate[DEPRECATED]/app/src/androidTest/java/co/nimblehq/rxjava/ui/screens/webview/WebViewFragmentTest.kt diff --git a/RxJavaTemplate/app/src/debug/AndroidManifest.xml b/RxJavaTemplate[DEPRECATED]/app/src/debug/AndroidManifest.xml similarity index 100% rename from RxJavaTemplate/app/src/debug/AndroidManifest.xml rename to RxJavaTemplate[DEPRECATED]/app/src/debug/AndroidManifest.xml diff --git a/RxJavaTemplate/app/src/debug/java/co/nimblehq/rxjava/EmptyHiltActivity.kt b/RxJavaTemplate[DEPRECATED]/app/src/debug/java/co/nimblehq/rxjava/EmptyHiltActivity.kt similarity index 100% rename from RxJavaTemplate/app/src/debug/java/co/nimblehq/rxjava/EmptyHiltActivity.kt rename to RxJavaTemplate[DEPRECATED]/app/src/debug/java/co/nimblehq/rxjava/EmptyHiltActivity.kt diff --git a/RxJavaTemplate/app/src/main/AndroidManifest.xml b/RxJavaTemplate[DEPRECATED]/app/src/main/AndroidManifest.xml similarity index 100% rename from RxJavaTemplate/app/src/main/AndroidManifest.xml rename to RxJavaTemplate[DEPRECATED]/app/src/main/AndroidManifest.xml diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/RxJavaTemplateApplication.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/RxJavaTemplateApplication.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/RxJavaTemplateApplication.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/RxJavaTemplateApplication.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/di/modules/AppModule.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/di/modules/AppModule.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/di/modules/AppModule.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/di/modules/AppModule.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/di/modules/FragmentComponentsModule.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/di/modules/FragmentComponentsModule.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/di/modules/FragmentComponentsModule.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/di/modules/FragmentComponentsModule.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/di/modules/GlideModule.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/di/modules/GlideModule.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/di/modules/GlideModule.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/di/modules/GlideModule.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/di/modules/MoshiModule.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/di/modules/MoshiModule.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/di/modules/MoshiModule.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/di/modules/MoshiModule.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/di/modules/OkHttpClientModule.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/di/modules/OkHttpClientModule.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/di/modules/OkHttpClientModule.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/di/modules/OkHttpClientModule.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/di/modules/RepositoryModule.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/di/modules/RepositoryModule.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/di/modules/RepositoryModule.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/di/modules/RepositoryModule.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/di/modules/RetrofitModule.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/di/modules/RetrofitModule.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/di/modules/RetrofitModule.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/di/modules/RetrofitModule.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/di/modules/StorageModule.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/di/modules/StorageModule.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/di/modules/StorageModule.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/di/modules/StorageModule.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/extension/ImageViewExtension.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/extension/ImageViewExtension.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/extension/ImageViewExtension.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/extension/ImageViewExtension.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/extension/KeywordExtension.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/extension/KeywordExtension.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/extension/KeywordExtension.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/extension/KeywordExtension.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/extension/ObservableExt.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/extension/ObservableExt.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/extension/ObservableExt.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/extension/ObservableExt.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/extension/RxJavaExtension.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/extension/RxJavaExtension.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/extension/RxJavaExtension.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/extension/RxJavaExtension.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/extension/RxViewExt.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/extension/RxViewExt.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/extension/RxViewExt.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/extension/RxViewExt.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/extension/ViewModelExt.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/extension/ViewModelExt.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/extension/ViewModelExt.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/extension/ViewModelExt.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/extension/WebViewExt.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/extension/WebViewExt.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/extension/WebViewExt.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/extension/WebViewExt.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/lib/Alias.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/lib/Alias.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/lib/Alias.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/lib/Alias.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/lib/transformation/ImageTransformation.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/lib/transformation/ImageTransformation.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/lib/transformation/ImageTransformation.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/lib/transformation/ImageTransformation.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/lib/viewmodel/ViewModelFactory.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/lib/viewmodel/ViewModelFactory.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/lib/viewmodel/ViewModelFactory.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/lib/viewmodel/ViewModelFactory.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/ErrorMapping.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/ErrorMapping.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/ErrorMapping.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/ErrorMapping.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/base/BaseActivity.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/base/BaseActivity.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/base/BaseActivity.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/base/BaseActivity.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/base/BaseFragment.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/base/BaseFragment.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/base/BaseFragment.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/base/BaseFragment.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/base/BaseFragmentCallbacks.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/base/BaseFragmentCallbacks.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/base/BaseFragmentCallbacks.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/base/BaseFragmentCallbacks.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/base/BaseNavigator.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/base/BaseNavigator.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/base/BaseNavigator.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/base/BaseNavigator.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/base/BaseViewModel.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/base/BaseViewModel.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/base/BaseViewModel.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/base/BaseViewModel.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/base/NavigationError.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/base/NavigationError.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/base/NavigationError.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/base/NavigationError.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/base/NavigationEvent.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/base/NavigationEvent.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/base/NavigationEvent.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/base/NavigationEvent.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/common/ItemClickable.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/common/ItemClickable.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/common/ItemClickable.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/common/ItemClickable.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/common/Toaster.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/common/Toaster.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/common/Toaster.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/common/Toaster.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/helpers/SupportEdge2EdgeHelper.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/helpers/SupportEdge2EdgeHelper.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/helpers/SupportEdge2EdgeHelper.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/helpers/SupportEdge2EdgeHelper.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/Const.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/screens/Const.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/Const.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/screens/Const.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/MainActivity.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/screens/MainActivity.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/MainActivity.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/screens/MainActivity.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/MainNavigator.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/screens/MainNavigator.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/MainNavigator.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/screens/MainNavigator.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/MainViewModel.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/screens/MainViewModel.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/MainViewModel.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/screens/MainViewModel.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/home/DataAdapter.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/screens/home/DataAdapter.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/home/DataAdapter.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/screens/home/DataAdapter.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/home/HomeFragment.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/screens/home/HomeFragment.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/home/HomeFragment.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/screens/home/HomeFragment.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/home/HomeViewModel.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/screens/home/HomeViewModel.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/home/HomeViewModel.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/screens/home/HomeViewModel.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/second/SecondBundle.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/screens/second/SecondBundle.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/second/SecondBundle.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/screens/second/SecondBundle.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/second/SecondFragment.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/screens/second/SecondFragment.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/second/SecondFragment.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/screens/second/SecondFragment.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/second/SecondViewModel.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/screens/second/SecondViewModel.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/second/SecondViewModel.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/screens/second/SecondViewModel.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/webview/AppWebChromeClient.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/screens/webview/AppWebChromeClient.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/webview/AppWebChromeClient.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/screens/webview/AppWebChromeClient.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/webview/WebViewBundle.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/screens/webview/WebViewBundle.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/webview/WebViewBundle.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/screens/webview/WebViewBundle.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/webview/WebViewFragment.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/screens/webview/WebViewFragment.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/webview/WebViewFragment.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/screens/webview/WebViewFragment.kt diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/webview/WebViewViewModel.kt b/RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/screens/webview/WebViewViewModel.kt similarity index 100% rename from RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/webview/WebViewViewModel.kt rename to RxJavaTemplate[DEPRECATED]/app/src/main/java/co/nimblehq/rxjava/ui/screens/webview/WebViewViewModel.kt diff --git a/RxJavaTemplate/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/RxJavaTemplate[DEPRECATED]/app/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from RxJavaTemplate/app/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/RxJavaTemplate/app/src/main/res/drawable/ic_launcher_background.xml b/RxJavaTemplate[DEPRECATED]/app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from RxJavaTemplate/app/src/main/res/drawable/ic_launcher_background.xml rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/drawable/ic_launcher_background.xml diff --git a/RxJavaTemplate/app/src/main/res/font/circularstd_bold.otf b/RxJavaTemplate[DEPRECATED]/app/src/main/res/font/circularstd_bold.otf similarity index 100% rename from RxJavaTemplate/app/src/main/res/font/circularstd_bold.otf rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/font/circularstd_bold.otf diff --git a/RxJavaTemplate/app/src/main/res/font/circularstd_book.otf b/RxJavaTemplate[DEPRECATED]/app/src/main/res/font/circularstd_book.otf similarity index 100% rename from RxJavaTemplate/app/src/main/res/font/circularstd_book.otf rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/font/circularstd_book.otf diff --git a/RxJavaTemplate/app/src/main/res/layout/activity_main.xml b/RxJavaTemplate[DEPRECATED]/app/src/main/res/layout/activity_main.xml similarity index 100% rename from RxJavaTemplate/app/src/main/res/layout/activity_main.xml rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/layout/activity_main.xml diff --git a/RxJavaTemplate/app/src/main/res/layout/fragment_home.xml b/RxJavaTemplate[DEPRECATED]/app/src/main/res/layout/fragment_home.xml similarity index 100% rename from RxJavaTemplate/app/src/main/res/layout/fragment_home.xml rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/layout/fragment_home.xml diff --git a/RxJavaTemplate/app/src/main/res/layout/fragment_second.xml b/RxJavaTemplate[DEPRECATED]/app/src/main/res/layout/fragment_second.xml similarity index 100% rename from RxJavaTemplate/app/src/main/res/layout/fragment_second.xml rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/layout/fragment_second.xml diff --git a/RxJavaTemplate/app/src/main/res/layout/fragment_webview.xml b/RxJavaTemplate[DEPRECATED]/app/src/main/res/layout/fragment_webview.xml similarity index 100% rename from RxJavaTemplate/app/src/main/res/layout/fragment_webview.xml rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/layout/fragment_webview.xml diff --git a/RxJavaTemplate/app/src/main/res/layout/item_data.xml b/RxJavaTemplate[DEPRECATED]/app/src/main/res/layout/item_data.xml similarity index 100% rename from RxJavaTemplate/app/src/main/res/layout/item_data.xml rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/layout/item_data.xml diff --git a/RxJavaTemplate/app/src/main/res/layout/view_loading.xml b/RxJavaTemplate[DEPRECATED]/app/src/main/res/layout/view_loading.xml similarity index 100% rename from RxJavaTemplate/app/src/main/res/layout/view_loading.xml rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/layout/view_loading.xml diff --git a/RxJavaTemplate/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/RxJavaTemplate[DEPRECATED]/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from RxJavaTemplate/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/RxJavaTemplate/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/RxJavaTemplate[DEPRECATED]/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from RxJavaTemplate/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/RxJavaTemplate/app/src/main/res/mipmap-hdpi/ic_launcher.png b/RxJavaTemplate[DEPRECATED]/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from RxJavaTemplate/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/RxJavaTemplate/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/RxJavaTemplate[DEPRECATED]/app/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from RxJavaTemplate/app/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/RxJavaTemplate/app/src/main/res/mipmap-mdpi/ic_launcher.png b/RxJavaTemplate[DEPRECATED]/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from RxJavaTemplate/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/RxJavaTemplate/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/RxJavaTemplate[DEPRECATED]/app/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from RxJavaTemplate/app/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/RxJavaTemplate/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/RxJavaTemplate[DEPRECATED]/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from RxJavaTemplate/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/RxJavaTemplate/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/RxJavaTemplate[DEPRECATED]/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from RxJavaTemplate/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/RxJavaTemplate/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/RxJavaTemplate[DEPRECATED]/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from RxJavaTemplate/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/RxJavaTemplate/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/RxJavaTemplate[DEPRECATED]/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from RxJavaTemplate/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/RxJavaTemplate/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/RxJavaTemplate[DEPRECATED]/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from RxJavaTemplate/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/RxJavaTemplate/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/RxJavaTemplate[DEPRECATED]/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from RxJavaTemplate/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/RxJavaTemplate/app/src/main/res/navigation/nav_graph_main.xml b/RxJavaTemplate[DEPRECATED]/app/src/main/res/navigation/nav_graph_main.xml similarity index 100% rename from RxJavaTemplate/app/src/main/res/navigation/nav_graph_main.xml rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/navigation/nav_graph_main.xml diff --git a/RxJavaTemplate/app/src/main/res/values-v23/colors.xml b/RxJavaTemplate[DEPRECATED]/app/src/main/res/values-v23/colors.xml similarity index 100% rename from RxJavaTemplate/app/src/main/res/values-v23/colors.xml rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/values-v23/colors.xml diff --git a/RxJavaTemplate/app/src/main/res/values-v26/colors.xml b/RxJavaTemplate[DEPRECATED]/app/src/main/res/values-v26/colors.xml similarity index 100% rename from RxJavaTemplate/app/src/main/res/values-v26/colors.xml rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/values-v26/colors.xml diff --git a/RxJavaTemplate/app/src/main/res/values/colors.xml b/RxJavaTemplate[DEPRECATED]/app/src/main/res/values/colors.xml similarity index 100% rename from RxJavaTemplate/app/src/main/res/values/colors.xml rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/values/colors.xml diff --git a/RxJavaTemplate/app/src/main/res/values/colors_pallete.xml b/RxJavaTemplate[DEPRECATED]/app/src/main/res/values/colors_pallete.xml similarity index 100% rename from RxJavaTemplate/app/src/main/res/values/colors_pallete.xml rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/values/colors_pallete.xml diff --git a/RxJavaTemplate/app/src/main/res/values/dimens_text.xml b/RxJavaTemplate[DEPRECATED]/app/src/main/res/values/dimens_text.xml similarity index 100% rename from RxJavaTemplate/app/src/main/res/values/dimens_text.xml rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/values/dimens_text.xml diff --git a/RxJavaTemplate/app/src/main/res/values/strings.xml b/RxJavaTemplate[DEPRECATED]/app/src/main/res/values/strings.xml similarity index 100% rename from RxJavaTemplate/app/src/main/res/values/strings.xml rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/values/strings.xml diff --git a/RxJavaTemplate/app/src/main/res/values/styles.xml b/RxJavaTemplate[DEPRECATED]/app/src/main/res/values/styles.xml similarity index 100% rename from RxJavaTemplate/app/src/main/res/values/styles.xml rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/values/styles.xml diff --git a/RxJavaTemplate/app/src/main/res/values/widget_styles.xml b/RxJavaTemplate[DEPRECATED]/app/src/main/res/values/widget_styles.xml similarity index 100% rename from RxJavaTemplate/app/src/main/res/values/widget_styles.xml rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/values/widget_styles.xml diff --git a/RxJavaTemplate/app/src/main/res/xml/network_security_config.xml b/RxJavaTemplate[DEPRECATED]/app/src/main/res/xml/network_security_config.xml similarity index 100% rename from RxJavaTemplate/app/src/main/res/xml/network_security_config.xml rename to RxJavaTemplate[DEPRECATED]/app/src/main/res/xml/network_security_config.xml diff --git a/RxJavaTemplate/app/src/staging/res/values/strings.xml b/RxJavaTemplate[DEPRECATED]/app/src/staging/res/values/strings.xml similarity index 100% rename from RxJavaTemplate/app/src/staging/res/values/strings.xml rename to RxJavaTemplate[DEPRECATED]/app/src/staging/res/values/strings.xml diff --git a/RxJavaTemplate/app/src/staging/res/values/strings_tokens_and_keys.xml b/RxJavaTemplate[DEPRECATED]/app/src/staging/res/values/strings_tokens_and_keys.xml similarity index 100% rename from RxJavaTemplate/app/src/staging/res/values/strings_tokens_and_keys.xml rename to RxJavaTemplate[DEPRECATED]/app/src/staging/res/values/strings_tokens_and_keys.xml diff --git a/RxJavaTemplate/app/src/staging/res/xml/network_security_config.xml b/RxJavaTemplate[DEPRECATED]/app/src/staging/res/xml/network_security_config.xml similarity index 100% rename from RxJavaTemplate/app/src/staging/res/xml/network_security_config.xml rename to RxJavaTemplate[DEPRECATED]/app/src/staging/res/xml/network_security_config.xml diff --git a/RxJavaTemplate/app/src/test/java/co/nimblehq/rxjava/extension/KeywordExtensionKtTest.kt b/RxJavaTemplate[DEPRECATED]/app/src/test/java/co/nimblehq/rxjava/extension/KeywordExtensionKtTest.kt similarity index 100% rename from RxJavaTemplate/app/src/test/java/co/nimblehq/rxjava/extension/KeywordExtensionKtTest.kt rename to RxJavaTemplate[DEPRECATED]/app/src/test/java/co/nimblehq/rxjava/extension/KeywordExtensionKtTest.kt diff --git a/RxJavaTemplate/app/src/test/java/co/nimblehq/rxjava/test/TestModules.kt b/RxJavaTemplate[DEPRECATED]/app/src/test/java/co/nimblehq/rxjava/test/TestModules.kt similarity index 100% rename from RxJavaTemplate/app/src/test/java/co/nimblehq/rxjava/test/TestModules.kt rename to RxJavaTemplate[DEPRECATED]/app/src/test/java/co/nimblehq/rxjava/test/TestModules.kt diff --git a/RxJavaTemplate/app/src/test/java/co/nimblehq/rxjava/test/ViewModelExt.kt b/RxJavaTemplate[DEPRECATED]/app/src/test/java/co/nimblehq/rxjava/test/ViewModelExt.kt similarity index 100% rename from RxJavaTemplate/app/src/test/java/co/nimblehq/rxjava/test/ViewModelExt.kt rename to RxJavaTemplate[DEPRECATED]/app/src/test/java/co/nimblehq/rxjava/test/ViewModelExt.kt diff --git a/RxJavaTemplate/app/src/test/java/co/nimblehq/rxjava/ui/screens/BaseFragmentTest.kt b/RxJavaTemplate[DEPRECATED]/app/src/test/java/co/nimblehq/rxjava/ui/screens/BaseFragmentTest.kt similarity index 100% rename from RxJavaTemplate/app/src/test/java/co/nimblehq/rxjava/ui/screens/BaseFragmentTest.kt rename to RxJavaTemplate[DEPRECATED]/app/src/test/java/co/nimblehq/rxjava/ui/screens/BaseFragmentTest.kt diff --git a/RxJavaTemplate/app/src/test/java/co/nimblehq/rxjava/ui/screens/MainNavigatorTest.kt b/RxJavaTemplate[DEPRECATED]/app/src/test/java/co/nimblehq/rxjava/ui/screens/MainNavigatorTest.kt similarity index 100% rename from RxJavaTemplate/app/src/test/java/co/nimblehq/rxjava/ui/screens/MainNavigatorTest.kt rename to RxJavaTemplate[DEPRECATED]/app/src/test/java/co/nimblehq/rxjava/ui/screens/MainNavigatorTest.kt diff --git a/RxJavaTemplate/app/src/test/java/co/nimblehq/rxjava/ui/screens/home/HomeViewModelTest.kt b/RxJavaTemplate[DEPRECATED]/app/src/test/java/co/nimblehq/rxjava/ui/screens/home/HomeViewModelTest.kt similarity index 100% rename from RxJavaTemplate/app/src/test/java/co/nimblehq/rxjava/ui/screens/home/HomeViewModelTest.kt rename to RxJavaTemplate[DEPRECATED]/app/src/test/java/co/nimblehq/rxjava/ui/screens/home/HomeViewModelTest.kt diff --git a/RxJavaTemplate/app/src/test/java/co/nimblehq/rxjava/ui/screens/second/SecondFragmentUnitTest.kt b/RxJavaTemplate[DEPRECATED]/app/src/test/java/co/nimblehq/rxjava/ui/screens/second/SecondFragmentUnitTest.kt similarity index 100% rename from RxJavaTemplate/app/src/test/java/co/nimblehq/rxjava/ui/screens/second/SecondFragmentUnitTest.kt rename to RxJavaTemplate[DEPRECATED]/app/src/test/java/co/nimblehq/rxjava/ui/screens/second/SecondFragmentUnitTest.kt diff --git a/RxJavaTemplate/app/src/test/java/co/nimblehq/rxjava/ui/screens/second/SecondViewModelTest.kt b/RxJavaTemplate[DEPRECATED]/app/src/test/java/co/nimblehq/rxjava/ui/screens/second/SecondViewModelTest.kt similarity index 100% rename from RxJavaTemplate/app/src/test/java/co/nimblehq/rxjava/ui/screens/second/SecondViewModelTest.kt rename to RxJavaTemplate[DEPRECATED]/app/src/test/java/co/nimblehq/rxjava/ui/screens/second/SecondViewModelTest.kt diff --git a/RxJavaTemplate/app/src/test/java/co/nimblehq/rxjava/ui/screens/webview/WebViewViewModelTest.kt b/RxJavaTemplate[DEPRECATED]/app/src/test/java/co/nimblehq/rxjava/ui/screens/webview/WebViewViewModelTest.kt similarity index 100% rename from RxJavaTemplate/app/src/test/java/co/nimblehq/rxjava/ui/screens/webview/WebViewViewModelTest.kt rename to RxJavaTemplate[DEPRECATED]/app/src/test/java/co/nimblehq/rxjava/ui/screens/webview/WebViewViewModelTest.kt diff --git a/RxJavaTemplate/app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/RxJavaTemplate[DEPRECATED]/app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker similarity index 100% rename from RxJavaTemplate/app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker rename to RxJavaTemplate[DEPRECATED]/app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker diff --git a/RxJavaTemplate/app/src/test/resources/robolectric.properties b/RxJavaTemplate[DEPRECATED]/app/src/test/resources/robolectric.properties similarity index 100% rename from RxJavaTemplate/app/src/test/resources/robolectric.properties rename to RxJavaTemplate[DEPRECATED]/app/src/test/resources/robolectric.properties diff --git a/RxJavaTemplate/build.gradle.kts b/RxJavaTemplate[DEPRECATED]/build.gradle.kts similarity index 100% rename from RxJavaTemplate/build.gradle.kts rename to RxJavaTemplate[DEPRECATED]/build.gradle.kts diff --git a/RxJavaTemplate/buildSrc/build.gradle.kts b/RxJavaTemplate[DEPRECATED]/buildSrc/build.gradle.kts similarity index 100% rename from RxJavaTemplate/buildSrc/build.gradle.kts rename to RxJavaTemplate[DEPRECATED]/buildSrc/build.gradle.kts diff --git a/RxJavaTemplate/buildSrc/src/main/java/Configurations.kt b/RxJavaTemplate[DEPRECATED]/buildSrc/src/main/java/Configurations.kt similarity index 100% rename from RxJavaTemplate/buildSrc/src/main/java/Configurations.kt rename to RxJavaTemplate[DEPRECATED]/buildSrc/src/main/java/Configurations.kt diff --git a/RxJavaTemplate/buildSrc/src/main/java/FileExt.kt b/RxJavaTemplate[DEPRECATED]/buildSrc/src/main/java/FileExt.kt similarity index 100% rename from RxJavaTemplate/buildSrc/src/main/java/FileExt.kt rename to RxJavaTemplate[DEPRECATED]/buildSrc/src/main/java/FileExt.kt diff --git a/RxJavaTemplate/buildSrc/src/main/java/Versions.kt b/RxJavaTemplate[DEPRECATED]/buildSrc/src/main/java/Versions.kt similarity index 97% rename from RxJavaTemplate/buildSrc/src/main/java/Versions.kt rename to RxJavaTemplate[DEPRECATED]/buildSrc/src/main/java/Versions.kt index 3493fb5d7..46d780f22 100644 --- a/RxJavaTemplate/buildSrc/src/main/java/Versions.kt +++ b/RxJavaTemplate[DEPRECATED]/buildSrc/src/main/java/Versions.kt @@ -2,7 +2,7 @@ object Versions { const val BUILD_GRADLE_VERSION = "4.2.2" const val ANDROID_VERSION_CODE = 9 - const val ANDROID_VERSION_NAME = "3.6.0" + const val ANDROID_VERSION_NAME = "3.7.0" const val ANDROID_MIN_SDK_VERSION = 23 const val ANDROID_TARGET_SDK_VERSION = 28 const val ANDROID_COMPILE_SDK_VERSION = 28 diff --git a/RxJavaTemplate/domain/.gitignore b/RxJavaTemplate[DEPRECATED]/common-rx/.gitignore similarity index 100% rename from RxJavaTemplate/domain/.gitignore rename to RxJavaTemplate[DEPRECATED]/common-rx/.gitignore diff --git a/RxJavaTemplate/common-rx/build.gradle.kts b/RxJavaTemplate[DEPRECATED]/common-rx/build.gradle.kts similarity index 100% rename from RxJavaTemplate/common-rx/build.gradle.kts rename to RxJavaTemplate[DEPRECATED]/common-rx/build.gradle.kts diff --git a/RxJavaTemplate/common-rx/src/main/java/co/nimblehq/rxjava/common/Optional.kt b/RxJavaTemplate[DEPRECATED]/common-rx/src/main/java/co/nimblehq/rxjava/common/Optional.kt similarity index 100% rename from RxJavaTemplate/common-rx/src/main/java/co/nimblehq/rxjava/common/Optional.kt rename to RxJavaTemplate[DEPRECATED]/common-rx/src/main/java/co/nimblehq/rxjava/common/Optional.kt diff --git a/RxJavaTemplate/common-rx/src/main/java/co/nimblehq/rxjava/common/transformers/FlowableNeverErrorTransformer.kt b/RxJavaTemplate[DEPRECATED]/common-rx/src/main/java/co/nimblehq/rxjava/common/transformers/FlowableNeverErrorTransformer.kt similarity index 100% rename from RxJavaTemplate/common-rx/src/main/java/co/nimblehq/rxjava/common/transformers/FlowableNeverErrorTransformer.kt rename to RxJavaTemplate[DEPRECATED]/common-rx/src/main/java/co/nimblehq/rxjava/common/transformers/FlowableNeverErrorTransformer.kt diff --git a/RxJavaTemplate/common-rx/src/main/java/co/nimblehq/rxjava/common/transformers/TakeWhenTransformer.kt b/RxJavaTemplate[DEPRECATED]/common-rx/src/main/java/co/nimblehq/rxjava/common/transformers/TakeWhenTransformer.kt similarity index 100% rename from RxJavaTemplate/common-rx/src/main/java/co/nimblehq/rxjava/common/transformers/TakeWhenTransformer.kt rename to RxJavaTemplate[DEPRECATED]/common-rx/src/main/java/co/nimblehq/rxjava/common/transformers/TakeWhenTransformer.kt diff --git a/RxJavaTemplate/common-rx/src/main/java/co/nimblehq/rxjava/common/transformers/Transformers.kt b/RxJavaTemplate[DEPRECATED]/common-rx/src/main/java/co/nimblehq/rxjava/common/transformers/Transformers.kt similarity index 100% rename from RxJavaTemplate/common-rx/src/main/java/co/nimblehq/rxjava/common/transformers/Transformers.kt rename to RxJavaTemplate[DEPRECATED]/common-rx/src/main/java/co/nimblehq/rxjava/common/transformers/Transformers.kt diff --git a/RxJavaTemplate/config/jacoco.gradle.kts b/RxJavaTemplate[DEPRECATED]/config/jacoco.gradle.kts similarity index 77% rename from RxJavaTemplate/config/jacoco.gradle.kts rename to RxJavaTemplate[DEPRECATED]/config/jacoco.gradle.kts index 205363425..66f308eab 100644 --- a/RxJavaTemplate/config/jacoco.gradle.kts +++ b/RxJavaTemplate[DEPRECATED]/config/jacoco.gradle.kts @@ -11,13 +11,28 @@ val fileGenerated = setOf( "**/*_ViewBinding*.*", "**/*Adapter*.*", "**/*Test*.*", - "android/**/*.*" + // Enum + "**/*\$Creator*", + // Nav Component + "**/*_Factory*", + "**/*FragmentArgs*", + "**/*FragmentDirections*", + "**/FragmentNavArgsLazy.kt", + "**/*Fragment*navArgs*", + "**/*ModuleDeps*.*", + "**/*NavGraphDirections*", + // Hilt + "**/*_HiltComponents*", + "**/*_HiltModules*", + "**/Hilt_*" ) val packagesExcluded = setOf( - "co/nimblehq/di/**", - "co/nimblehq/ui/**/di/**", - "com/bumptech/glide" + "**/com/bumptech/glide", + "**/dagger/hilt/internal", + "**/hilt_aggregated_deps", + "**/co/nimblehq/rxjava/databinding/**", + "**/co/nimblehq/rxjava/di/**" ) val fileFilter = fileGenerated + packagesExcluded @@ -27,8 +42,10 @@ val classDirectoriesTree = files( include( "**/app/build/intermediates/javac/stagingDebug/classes/**", "**/data/build/intermediates/javac/stagingDebug/classes/**", + "**/domain/build/intermediates/javac/stagingDebug/classes/**", "**/app/build/tmp/kotlin-classes/stagingDebug/**", - "**/data/build/tmp/kotlin-classes/stagingDebug/**" + "**/data/build/tmp/kotlin-classes/stagingDebug/**", + "**/domain/build/tmp/kotlin-classes/stagingDebug/**" ) exclude(fileFilter) } @@ -37,7 +54,8 @@ val classDirectoriesTree = files( val sourceDirectoriesTree = files( listOf( "${project.rootDir}/app/src/main/java", - "${project.rootDir}/data/src/main/java" + "${project.rootDir}/data/src/main/java", + "${project.rootDir}/domain/src/main/java" ) ) @@ -53,7 +71,8 @@ val sourceDirectoriesTree = files( val executionDataTree = fileTree(project.rootDir) { include( "app/jacoco.exec", - "common/jacoco.exec" + "data/jacoco.exec", + "domain/jacoco.exec" ) } @@ -63,7 +82,8 @@ tasks.register("jacocoTestReport") { dependsOn( ":app:testStagingDebugUnitTest", - ":data:testStagingDebugUnitTest" + ":data:testStagingDebugUnitTest", + ":domain:testStagingDebugUnitTest" ) classDirectories.setFrom(classDirectoriesTree) diff --git a/RxJavaTemplate[DEPRECATED]/data/.gitignore b/RxJavaTemplate[DEPRECATED]/data/.gitignore new file mode 100644 index 000000000..796b96d1c --- /dev/null +++ b/RxJavaTemplate[DEPRECATED]/data/.gitignore @@ -0,0 +1 @@ +/build diff --git a/RxJavaTemplate/data/build.gradle.kts b/RxJavaTemplate[DEPRECATED]/data/build.gradle.kts similarity index 100% rename from RxJavaTemplate/data/build.gradle.kts rename to RxJavaTemplate[DEPRECATED]/data/build.gradle.kts diff --git a/RxJavaTemplate/data/proguard-rules.pro b/RxJavaTemplate[DEPRECATED]/data/proguard-rules.pro similarity index 100% rename from RxJavaTemplate/data/proguard-rules.pro rename to RxJavaTemplate[DEPRECATED]/data/proguard-rules.pro diff --git a/RxJavaTemplate/data/src/main/AndroidManifest.xml b/RxJavaTemplate[DEPRECATED]/data/src/main/AndroidManifest.xml similarity index 100% rename from RxJavaTemplate/data/src/main/AndroidManifest.xml rename to RxJavaTemplate[DEPRECATED]/data/src/main/AndroidManifest.xml diff --git a/RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/ApiService.kt b/RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/ApiService.kt similarity index 100% rename from RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/ApiService.kt rename to RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/ApiService.kt diff --git a/RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/common/ApiConst.kt b/RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/common/ApiConst.kt similarity index 100% rename from RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/common/ApiConst.kt rename to RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/common/ApiConst.kt diff --git a/RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/common/secrets/ApiEndpointUrl.kt b/RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/common/secrets/ApiEndpointUrl.kt similarity index 100% rename from RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/common/secrets/ApiEndpointUrl.kt rename to RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/common/secrets/ApiEndpointUrl.kt diff --git a/RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/common/secrets/ClientId.kt b/RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/common/secrets/ClientId.kt similarity index 100% rename from RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/common/secrets/ClientId.kt rename to RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/common/secrets/ClientId.kt diff --git a/RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/common/secrets/ClientSecret.kt b/RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/common/secrets/ClientSecret.kt similarity index 100% rename from RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/common/secrets/ClientSecret.kt rename to RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/common/secrets/ClientSecret.kt diff --git a/RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/common/secrets/Secrets.kt b/RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/common/secrets/Secrets.kt similarity index 100% rename from RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/common/secrets/Secrets.kt rename to RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/common/secrets/Secrets.kt diff --git a/RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/error/Exceptions.kt b/RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/error/Exceptions.kt similarity index 100% rename from RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/error/Exceptions.kt rename to RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/error/Exceptions.kt diff --git a/RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/interceptor/AppRequestInterceptor.kt b/RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/interceptor/AppRequestInterceptor.kt similarity index 100% rename from RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/interceptor/AppRequestInterceptor.kt rename to RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/interceptor/AppRequestInterceptor.kt diff --git a/RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/providers/ApiServiceProvider.kt b/RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/providers/ApiServiceProvider.kt similarity index 100% rename from RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/providers/ApiServiceProvider.kt rename to RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/providers/ApiServiceProvider.kt diff --git a/RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/providers/ConverterFactoryProvider.kt b/RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/providers/ConverterFactoryProvider.kt similarity index 100% rename from RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/providers/ConverterFactoryProvider.kt rename to RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/providers/ConverterFactoryProvider.kt diff --git a/RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/providers/MoshiBuilderProvider.kt b/RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/providers/MoshiBuilderProvider.kt similarity index 100% rename from RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/providers/MoshiBuilderProvider.kt rename to RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/providers/MoshiBuilderProvider.kt diff --git a/RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/providers/RetrofitProvider.kt b/RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/providers/RetrofitProvider.kt similarity index 100% rename from RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/providers/RetrofitProvider.kt rename to RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/providers/RetrofitProvider.kt diff --git a/RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/request/ExampleApiRequest.kt b/RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/request/ExampleApiRequest.kt similarity index 100% rename from RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/request/ExampleApiRequest.kt rename to RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/request/ExampleApiRequest.kt diff --git a/RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/response/ErrorResponse.kt b/RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/response/ErrorResponse.kt similarity index 100% rename from RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/response/ErrorResponse.kt rename to RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/response/ErrorResponse.kt diff --git a/RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/response/ExampleApiResponse.kt b/RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/response/ExampleApiResponse.kt similarity index 100% rename from RxJavaTemplate/data/src/main/java/co/nimblehq/rxjava/data/service/response/ExampleApiResponse.kt rename to RxJavaTemplate[DEPRECATED]/data/src/main/java/co/nimblehq/rxjava/data/service/response/ExampleApiResponse.kt diff --git a/RxJavaTemplate/data/src/main/res/values/strings.xml b/RxJavaTemplate[DEPRECATED]/data/src/main/res/values/strings.xml similarity index 100% rename from RxJavaTemplate/data/src/main/res/values/strings.xml rename to RxJavaTemplate[DEPRECATED]/data/src/main/res/values/strings.xml diff --git a/RxJavaTemplate/data/src/production/java/co/nimblehq/rxjava/data/service/common/secrets/ApiEndpointUrlImpl.kt b/RxJavaTemplate[DEPRECATED]/data/src/production/java/co/nimblehq/rxjava/data/service/common/secrets/ApiEndpointUrlImpl.kt similarity index 100% rename from RxJavaTemplate/data/src/production/java/co/nimblehq/rxjava/data/service/common/secrets/ApiEndpointUrlImpl.kt rename to RxJavaTemplate[DEPRECATED]/data/src/production/java/co/nimblehq/rxjava/data/service/common/secrets/ApiEndpointUrlImpl.kt diff --git a/RxJavaTemplate/data/src/production/java/co/nimblehq/rxjava/data/service/common/secrets/ClientIdImpl.kt b/RxJavaTemplate[DEPRECATED]/data/src/production/java/co/nimblehq/rxjava/data/service/common/secrets/ClientIdImpl.kt similarity index 100% rename from RxJavaTemplate/data/src/production/java/co/nimblehq/rxjava/data/service/common/secrets/ClientIdImpl.kt rename to RxJavaTemplate[DEPRECATED]/data/src/production/java/co/nimblehq/rxjava/data/service/common/secrets/ClientIdImpl.kt diff --git a/RxJavaTemplate/data/src/production/java/co/nimblehq/rxjava/data/service/common/secrets/ClientSecretImpl.kt b/RxJavaTemplate[DEPRECATED]/data/src/production/java/co/nimblehq/rxjava/data/service/common/secrets/ClientSecretImpl.kt similarity index 100% rename from RxJavaTemplate/data/src/production/java/co/nimblehq/rxjava/data/service/common/secrets/ClientSecretImpl.kt rename to RxJavaTemplate[DEPRECATED]/data/src/production/java/co/nimblehq/rxjava/data/service/common/secrets/ClientSecretImpl.kt diff --git a/RxJavaTemplate/data/src/staging/java/co/nimblehq/rxjava/data/service/common/secrets/ApiEndpointUrlImpl.kt b/RxJavaTemplate[DEPRECATED]/data/src/staging/java/co/nimblehq/rxjava/data/service/common/secrets/ApiEndpointUrlImpl.kt similarity index 100% rename from RxJavaTemplate/data/src/staging/java/co/nimblehq/rxjava/data/service/common/secrets/ApiEndpointUrlImpl.kt rename to RxJavaTemplate[DEPRECATED]/data/src/staging/java/co/nimblehq/rxjava/data/service/common/secrets/ApiEndpointUrlImpl.kt diff --git a/RxJavaTemplate/data/src/staging/java/co/nimblehq/rxjava/data/service/common/secrets/ClientIdImpl.kt b/RxJavaTemplate[DEPRECATED]/data/src/staging/java/co/nimblehq/rxjava/data/service/common/secrets/ClientIdImpl.kt similarity index 100% rename from RxJavaTemplate/data/src/staging/java/co/nimblehq/rxjava/data/service/common/secrets/ClientIdImpl.kt rename to RxJavaTemplate[DEPRECATED]/data/src/staging/java/co/nimblehq/rxjava/data/service/common/secrets/ClientIdImpl.kt diff --git a/RxJavaTemplate/data/src/staging/java/co/nimblehq/rxjava/data/service/common/secrets/ClientSecretImpl.kt b/RxJavaTemplate[DEPRECATED]/data/src/staging/java/co/nimblehq/rxjava/data/service/common/secrets/ClientSecretImpl.kt similarity index 100% rename from RxJavaTemplate/data/src/staging/java/co/nimblehq/rxjava/data/service/common/secrets/ClientSecretImpl.kt rename to RxJavaTemplate[DEPRECATED]/data/src/staging/java/co/nimblehq/rxjava/data/service/common/secrets/ClientSecretImpl.kt diff --git a/RxJavaTemplate/data/src/test/java/co/nimblehq/rxjava/data/service/ApiServiceTest.kt b/RxJavaTemplate[DEPRECATED]/data/src/test/java/co/nimblehq/rxjava/data/service/ApiServiceTest.kt similarity index 100% rename from RxJavaTemplate/data/src/test/java/co/nimblehq/rxjava/data/service/ApiServiceTest.kt rename to RxJavaTemplate[DEPRECATED]/data/src/test/java/co/nimblehq/rxjava/data/service/ApiServiceTest.kt diff --git a/RxJavaTemplate/detekt-config.yml b/RxJavaTemplate[DEPRECATED]/detekt-config.yml similarity index 100% rename from RxJavaTemplate/detekt-config.yml rename to RxJavaTemplate[DEPRECATED]/detekt-config.yml diff --git a/RxJavaTemplate[DEPRECATED]/domain/.gitignore b/RxJavaTemplate[DEPRECATED]/domain/.gitignore new file mode 100644 index 000000000..796b96d1c --- /dev/null +++ b/RxJavaTemplate[DEPRECATED]/domain/.gitignore @@ -0,0 +1 @@ +/build diff --git a/RxJavaTemplate/domain/build.gradle.kts b/RxJavaTemplate[DEPRECATED]/domain/build.gradle.kts similarity index 79% rename from RxJavaTemplate/domain/build.gradle.kts rename to RxJavaTemplate[DEPRECATED]/domain/build.gradle.kts index dc91d8f80..1799ae357 100644 --- a/RxJavaTemplate/domain/build.gradle.kts +++ b/RxJavaTemplate[DEPRECATED]/domain/build.gradle.kts @@ -36,6 +36,14 @@ android { } getByName(BuildType.DEBUG) { isMinifyEnabled = false + /** + * From AGP 4.2.0, Jacoco generates the report incorrectly, and the report is missing + * some code coverage from module. On the new version of Gradle, they introduce a new + * flag [testCoverageEnabled], we must enable this flag if using Jacoco to capture + * coverage and creates a report in the build directory. + * Reference: https://developer.android.com/reference/tools/gradle-api/7.1/com/android/build/api/dsl/BuildType#istestcoverageenabled + */ + isTestCoverageEnabled = true } } diff --git a/RxJavaTemplate/domain/proguard-rules.pro b/RxJavaTemplate[DEPRECATED]/domain/proguard-rules.pro similarity index 100% rename from RxJavaTemplate/domain/proguard-rules.pro rename to RxJavaTemplate[DEPRECATED]/domain/proguard-rules.pro diff --git a/RxJavaTemplate/domain/src/main/AndroidManifest.xml b/RxJavaTemplate[DEPRECATED]/domain/src/main/AndroidManifest.xml similarity index 100% rename from RxJavaTemplate/domain/src/main/AndroidManifest.xml rename to RxJavaTemplate[DEPRECATED]/domain/src/main/AndroidManifest.xml diff --git a/RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/ResponseMapping.kt b/RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/ResponseMapping.kt similarity index 100% rename from RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/ResponseMapping.kt rename to RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/ResponseMapping.kt diff --git a/RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/data/Data.kt b/RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/data/Data.kt similarity index 100% rename from RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/data/Data.kt rename to RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/data/Data.kt diff --git a/RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/data/error/AppError.kt b/RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/data/error/AppError.kt similarity index 100% rename from RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/data/error/AppError.kt rename to RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/data/error/AppError.kt diff --git a/RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/data/error/DataError.kt b/RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/data/error/DataError.kt similarity index 100% rename from RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/data/error/DataError.kt rename to RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/data/error/DataError.kt diff --git a/RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/data/error/ValidateError.kt b/RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/data/error/ValidateError.kt similarity index 100% rename from RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/data/error/ValidateError.kt rename to RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/data/error/ValidateError.kt diff --git a/RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/extension/SharePreferencesExt.kt b/RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/extension/SharePreferencesExt.kt similarity index 100% rename from RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/extension/SharePreferencesExt.kt rename to RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/extension/SharePreferencesExt.kt diff --git a/RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/repository/ApiRepository.kt b/RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/repository/ApiRepository.kt similarity index 100% rename from RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/repository/ApiRepository.kt rename to RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/repository/ApiRepository.kt diff --git a/RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/schedulers/SchedulerProvider.kt b/RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/schedulers/SchedulerProvider.kt similarity index 100% rename from RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/schedulers/SchedulerProvider.kt rename to RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/schedulers/SchedulerProvider.kt diff --git a/RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/storage/BaseSharedPreferences.kt b/RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/storage/BaseSharedPreferences.kt similarity index 100% rename from RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/storage/BaseSharedPreferences.kt rename to RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/storage/BaseSharedPreferences.kt diff --git a/RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/storage/EncryptedSharedPreferences.kt b/RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/storage/EncryptedSharedPreferences.kt similarity index 100% rename from RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/storage/EncryptedSharedPreferences.kt rename to RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/storage/EncryptedSharedPreferences.kt diff --git a/RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/storage/NormalSharedPreferences.kt b/RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/storage/NormalSharedPreferences.kt similarity index 100% rename from RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/storage/NormalSharedPreferences.kt rename to RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/storage/NormalSharedPreferences.kt diff --git a/RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/test/MockUtil.kt b/RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/test/MockUtil.kt similarity index 100% rename from RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/test/MockUtil.kt rename to RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/test/MockUtil.kt diff --git a/RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/usecase/GetExampleDataUseCase.kt b/RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/usecase/GetExampleDataUseCase.kt similarity index 100% rename from RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/usecase/GetExampleDataUseCase.kt rename to RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/usecase/GetExampleDataUseCase.kt diff --git a/RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/usecase/base/BaseUseCase.kt b/RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/usecase/base/BaseUseCase.kt similarity index 100% rename from RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/usecase/base/BaseUseCase.kt rename to RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/usecase/base/BaseUseCase.kt diff --git a/RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/usecase/base/CompletableUseCase.kt b/RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/usecase/base/CompletableUseCase.kt similarity index 100% rename from RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/usecase/base/CompletableUseCase.kt rename to RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/usecase/base/CompletableUseCase.kt diff --git a/RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/usecase/base/FlowableUseCase.kt b/RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/usecase/base/FlowableUseCase.kt similarity index 100% rename from RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/usecase/base/FlowableUseCase.kt rename to RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/usecase/base/FlowableUseCase.kt diff --git a/RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/usecase/base/SingleUseCase.kt b/RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/usecase/base/SingleUseCase.kt similarity index 100% rename from RxJavaTemplate/domain/src/main/java/co/nimblehq/rxjava/domain/usecase/base/SingleUseCase.kt rename to RxJavaTemplate[DEPRECATED]/domain/src/main/java/co/nimblehq/rxjava/domain/usecase/base/SingleUseCase.kt diff --git a/RxJavaTemplate/domain/src/test/java/co/nimblehq/rxjava/domain/ResponseMappingTest.kt b/RxJavaTemplate[DEPRECATED]/domain/src/test/java/co/nimblehq/rxjava/domain/ResponseMappingTest.kt similarity index 100% rename from RxJavaTemplate/domain/src/test/java/co/nimblehq/rxjava/domain/ResponseMappingTest.kt rename to RxJavaTemplate[DEPRECATED]/domain/src/test/java/co/nimblehq/rxjava/domain/ResponseMappingTest.kt diff --git a/RxJavaTemplate/domain/src/test/java/co/nimblehq/rxjava/domain/repository/ApiRepositoryTest.kt b/RxJavaTemplate[DEPRECATED]/domain/src/test/java/co/nimblehq/rxjava/domain/repository/ApiRepositoryTest.kt similarity index 100% rename from RxJavaTemplate/domain/src/test/java/co/nimblehq/rxjava/domain/repository/ApiRepositoryTest.kt rename to RxJavaTemplate[DEPRECATED]/domain/src/test/java/co/nimblehq/rxjava/domain/repository/ApiRepositoryTest.kt diff --git a/RxJavaTemplate/domain/src/test/java/co/nimblehq/rxjava/domain/usecase/GetExampleDataUseCaseTest.kt b/RxJavaTemplate[DEPRECATED]/domain/src/test/java/co/nimblehq/rxjava/domain/usecase/GetExampleDataUseCaseTest.kt similarity index 100% rename from RxJavaTemplate/domain/src/test/java/co/nimblehq/rxjava/domain/usecase/GetExampleDataUseCaseTest.kt rename to RxJavaTemplate[DEPRECATED]/domain/src/test/java/co/nimblehq/rxjava/domain/usecase/GetExampleDataUseCaseTest.kt diff --git a/RxJavaTemplate/fastlane/Appfile b/RxJavaTemplate[DEPRECATED]/fastlane/Appfile similarity index 100% rename from RxJavaTemplate/fastlane/Appfile rename to RxJavaTemplate[DEPRECATED]/fastlane/Appfile diff --git a/RxJavaTemplate/fastlane/Fastfile b/RxJavaTemplate[DEPRECATED]/fastlane/Fastfile similarity index 100% rename from RxJavaTemplate/fastlane/Fastfile rename to RxJavaTemplate[DEPRECATED]/fastlane/Fastfile diff --git a/RxJavaTemplate/fastlane/Pluginfile b/RxJavaTemplate[DEPRECATED]/fastlane/Pluginfile similarity index 100% rename from RxJavaTemplate/fastlane/Pluginfile rename to RxJavaTemplate[DEPRECATED]/fastlane/Pluginfile diff --git a/RxJavaTemplate/fastlane/README.md b/RxJavaTemplate[DEPRECATED]/fastlane/README.md similarity index 100% rename from RxJavaTemplate/fastlane/README.md rename to RxJavaTemplate[DEPRECATED]/fastlane/README.md diff --git a/RxJavaTemplate/fastlane/script/build.rb b/RxJavaTemplate[DEPRECATED]/fastlane/script/build.rb similarity index 100% rename from RxJavaTemplate/fastlane/script/build.rb rename to RxJavaTemplate[DEPRECATED]/fastlane/script/build.rb diff --git a/RxJavaTemplate/fastlane/script/config.rb b/RxJavaTemplate[DEPRECATED]/fastlane/script/config.rb similarity index 100% rename from RxJavaTemplate/fastlane/script/config.rb rename to RxJavaTemplate[DEPRECATED]/fastlane/script/config.rb diff --git a/RxJavaTemplate/gradle.properties b/RxJavaTemplate[DEPRECATED]/gradle.properties similarity index 100% rename from RxJavaTemplate/gradle.properties rename to RxJavaTemplate[DEPRECATED]/gradle.properties diff --git a/RxJavaTemplate/gradle/wrapper/gradle-wrapper.jar b/RxJavaTemplate[DEPRECATED]/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from RxJavaTemplate/gradle/wrapper/gradle-wrapper.jar rename to RxJavaTemplate[DEPRECATED]/gradle/wrapper/gradle-wrapper.jar diff --git a/RxJavaTemplate/gradle/wrapper/gradle-wrapper.properties b/RxJavaTemplate[DEPRECATED]/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from RxJavaTemplate/gradle/wrapper/gradle-wrapper.properties rename to RxJavaTemplate[DEPRECATED]/gradle/wrapper/gradle-wrapper.properties diff --git a/RxJavaTemplate/gradlew b/RxJavaTemplate[DEPRECATED]/gradlew similarity index 100% rename from RxJavaTemplate/gradlew rename to RxJavaTemplate[DEPRECATED]/gradlew diff --git a/RxJavaTemplate/gradlew.bat b/RxJavaTemplate[DEPRECATED]/gradlew.bat similarity index 100% rename from RxJavaTemplate/gradlew.bat rename to RxJavaTemplate[DEPRECATED]/gradlew.bat diff --git a/RxJavaTemplate/settings.gradle.kts b/RxJavaTemplate[DEPRECATED]/settings.gradle.kts similarity index 100% rename from RxJavaTemplate/settings.gradle.kts rename to RxJavaTemplate[DEPRECATED]/settings.gradle.kts diff --git a/RxJavaTemplate/signing.properties b/RxJavaTemplate[DEPRECATED]/signing.properties similarity index 100% rename from RxJavaTemplate/signing.properties rename to RxJavaTemplate[DEPRECATED]/signing.properties diff --git a/newproject.sh b/newproject.sh index 3137b4b6f..375a4429a 100755 --- a/newproject.sh +++ b/newproject.sh @@ -77,7 +77,7 @@ case "$template" in ;; "rx") OLD_APPNAME="RxJava Template" - OLD_NAME="RxJavaTemplate" + OLD_NAME="RxJavaTemplate[DEPRECATED]" OLD_PACKAGE="co.nimblehq.rxjava" THIRD_PACKAGE_SEGMENT="rxjava" ;;