Commit 05f610cb authored by fengruiyu's avatar fengruiyu

App主工程加载base

parent 3d12fe52
<component name="ProjectCodeStyleConfiguration"> <component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173"> <code_scheme name="Project" version="173">
<JetCodeStyleSettings>
<option name="PACKAGES_TO_USE_STAR_IMPORTS">
<value>
<package name="java.util" alias="false" withSubpackages="false" />
<package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
<package name="io.ktor" alias="false" withSubpackages="true" />
</value>
</option>
<option name="PACKAGES_IMPORT_LAYOUT">
<value>
<package name="" alias="false" withSubpackages="true" />
<package name="java" alias="false" withSubpackages="true" />
<package name="javax" alias="false" withSubpackages="true" />
<package name="kotlin" alias="false" withSubpackages="true" />
<package name="" alias="true" withSubpackages="true" />
</value>
</option>
</JetCodeStyleSettings>
<codeStyleSettings language="XML"> <codeStyleSettings language="XML">
<indentOptions> <indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="4" /> <option name="CONTINUATION_INDENT_SIZE" value="4" />
......
...@@ -23,6 +23,10 @@ android { ...@@ -23,6 +23,10 @@ android {
dataBinding { dataBinding {
enabled true enabled true
} }
compileOptions {
sourceCompatibility rootProject.ext.java_version["compileJavaVersion"]
targetCompatibility rootProject.ext.java_version["targetJavaVersion"]
}
} }
dependencies { dependencies {
...@@ -33,4 +37,7 @@ dependencies { ...@@ -33,4 +37,7 @@ dependencies {
androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
api project(':library_base')
} }
\ No newline at end of file
...@@ -33,7 +33,7 @@ android { ...@@ -33,7 +33,7 @@ android {
if (!isBuildModule.toBoolean()) { if (!isBuildModule.toBoolean()) {
resources { resources {
//正式版本时,排除debug文件夹下所有调试文件 //正式版本时,排除debug文件夹下所有调试文件
exclude 'src/debug/*' // exclude 'src/debug/*'
} }
} }
} }
...@@ -51,16 +51,7 @@ android { ...@@ -51,16 +51,7 @@ android {
} }
} }
productFlavors {
//包含所有环境
auto {
buildConfigField ("boolean","IS_DEV","true")
}
// 线上产品版本
product {
buildConfigField ("boolean","IS_DEV","false")
}
}
compileOptions { compileOptions {
sourceCompatibility rootProject.ext.java_version["compileJavaVersion"] sourceCompatibility rootProject.ext.java_version["compileJavaVersion"]
targetCompatibility rootProject.ext.java_version["targetJavaVersion"] targetCompatibility rootProject.ext.java_version["targetJavaVersion"]
......
#Wed Jun 30 14:54:57 CST 2021 #Wed Jun 30 16:30:43 CST 2021
VERSION_BUILD=2207 VERSION_BUILD=2216
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment