合并测试6
This commit is contained in:
parent
df7ed7299c
commit
6b5181e88d
@ -4,7 +4,7 @@
|
|||||||
<component name="GradleSettings">
|
<component name="GradleSettings">
|
||||||
<option name="linkedExternalProjectsSettings">
|
<option name="linkedExternalProjectsSettings">
|
||||||
<GradleProjectSettings>
|
<GradleProjectSettings>
|
||||||
<option name="testRunner" value="PLATFORM" />
|
<option name="testRunner" value="GRADLE" />
|
||||||
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
||||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||||
<option name="modules">
|
<option name="modules">
|
||||||
@ -14,7 +14,6 @@
|
|||||||
<option value="$PROJECT_DIR$/mylibrary" />
|
<option value="$PROJECT_DIR$/mylibrary" />
|
||||||
</set>
|
</set>
|
||||||
</option>
|
</option>
|
||||||
<option name="resolveModulePerSourceSet" value="false" />
|
|
||||||
</GradleProjectSettings>
|
</GradleProjectSettings>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
|
@ -1,10 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="RunConfigurationProducerService">
|
|
||||||
<option name="ignoredProducers">
|
|
||||||
<set>
|
|
||||||
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
|
|
||||||
</set>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
@ -29,6 +29,7 @@ public class App extends Application {
|
|||||||
System.out.println("我是master2");
|
System.out.println("我是master2");
|
||||||
mApplication = this;
|
mApplication = this;
|
||||||
System.out.println("woshikotlin2");
|
System.out.println("woshikotlin2");
|
||||||
|
System.out.println("woshikotlin3");
|
||||||
CommonBaseLibrary.getInstance().init(this, Api.BASE_URL);
|
CommonBaseLibrary.getInstance().init(this, Api.BASE_URL);
|
||||||
// if (BuildConfig.DEBUG){
|
// if (BuildConfig.DEBUG){
|
||||||
// CrashHandler.getInstance().init(this);
|
// CrashHandler.getInstance().init(this);
|
||||||
|
Loading…
Reference in New Issue
Block a user