Skip to content

Commit 4913e79

Browse files
authored
Add base module so that it can merge into other branch project indenpendently (#1)
1 parent c4ff487 commit 4913e79

22 files changed

Lines changed: 68 additions & 87 deletions

File tree

app/build.gradle.kts

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,17 @@ importCommonPlugins()
77
configAndroid()
88
importCommonDependencies()
99

10-
dependencies {
11-
implementation(Dependencies.AndroidX.appCompat)
12-
implementation(Dependencies.AndroidX.coreKtx)
13-
implementation(Dependencies.AndroidX.constraintLayout)
14-
testImplementation(Dependencies.Test.junit)
15-
androidTestImplementation(Dependencies.Test.runner)
16-
androidTestImplementation(Dependencies.Test.espressoCore)
17-
18-
implementation(Dependencies.okhttp)
19-
implementation(Dependencies.okhttpLogging)
20-
implementation(Dependencies.Retrofit.core)
21-
implementation(Dependencies.Retrofit.gsonConverter)
22-
implementation(Dependencies.Retrofit.rxJavaAdapter)
10+
android {
11+
defaultConfig {
12+
applicationId = Versions.App.id
13+
}
14+
}
2315

24-
implementation(Dependencies.Logging.logger)
16+
dependencies {
2517
implementation(Dependencies.Epoxy.core)
2618
implementation(Dependencies.Epoxy.paging)
2719
implementation(Dependencies.Epoxy.databinding)
2820
"kapt"(Dependencies.Epoxy.processor)
21+
22+
implementation(project(":base"))
2923
}

app/src/androidTest/java/com/enginebai/project/base/ExampleInstrumentedTest.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package com.enginebai.project.base
22

33
import androidx.test.platform.app.InstrumentationRegistry
4-
import androidx.test.ext.junit.runners.AndroidJUnit4
5-
4+
import androidx.test.runner.AndroidJUnit4
5+
import org.junit.Assert.assertEquals
66
import org.junit.Test
77
import org.junit.runner.RunWith
88

9-
import org.junit.Assert.*
10-
119
/**
1210
* Instrumented test, which will execute on an Android device.
1311
*

app/src/main/java/com/enginebai/project/AppContext.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.enginebai.project
22

33
import android.app.Application
4-
import com.enginebai.project.di.loggingModule
5-
import com.enginebai.project.di.networkModule
4+
import com.enginebai.base.di.loggingModule
5+
import com.enginebai.base.di.networkModule
66
import com.orhanobut.logger.Logger
77
import org.koin.android.ext.android.get
88
import org.koin.android.ext.koin.androidContext

app/src/main/java/com/enginebai/project/BindingAdapter.kt

Lines changed: 0 additions & 13 deletions
This file was deleted.

app/src/main/java/com/enginebai/project/MainActivity.kt

Lines changed: 0 additions & 8 deletions
This file was deleted.

app/src/main/java/com/enginebai/project/package-info.java

Lines changed: 0 additions & 4 deletions
This file was deleted.

app/src/main/res/layout/activity_main.xml

Lines changed: 0 additions & 18 deletions
This file was deleted.

base/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build

base/README.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
## File Structures
2+
* `/base` module:
3+
* Responsibility: define the base, common and utilities classes.
4+
* It can be updated by merging base repository, and will not affect the project modules.
5+
* `/app` module:
6+
* Responsibility: define all the features in your app.
7+
* Define `applicationId` as app package name.
8+
* Include all resources that app used. (including strings, colors, dimensions, drawables.)
9+
10+
## Dependencies
11+
* `/app` include `/base` serves as common library that the whole project used.
12+
13+
## Don't do
14+
Don't add anything to the module other than `/base`, since other modules will change the package to feature, and it will break the merge.
15+

base/build.gradle.kts

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
plugins {
2+
id("com.android.library")
3+
}
4+
5+
importCommonPlugins()
6+
configAndroid()
7+
importCommonDependencies()
8+
9+
dependencies {
10+
implementation(Dependencies.okhttp)
11+
implementation(Dependencies.okhttpLogging)
12+
implementation(Dependencies.Retrofit.core)
13+
implementation(Dependencies.Retrofit.gsonConverter)
14+
implementation(Dependencies.Retrofit.rxJavaAdapter)
15+
}
16+

0 commit comments

Comments
 (0)