diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 62f8f6fabb..3dda1fe044 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,7 +4,7 @@ diff --git a/app/build.gradle b/app/build.gradle index 2380acaa01..e83aa23e4c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -187,6 +187,7 @@ dependencies { implementation rootProject.ext.dependencies.crashreportbugly implementation rootProject.ext.dependencies.mogo_core_data + implementation rootProject.ext.dependencies.mogo_core_function_main implementation rootProject.ext.dependencies.mogo_core_function_obu_mogo implementation rootProject.ext.dependencies.mogo_core_function_smp implementation rootProject.ext.dependencies.mogo_core_function_hmi @@ -210,7 +211,6 @@ dependencies { implementation project(':modules:mogo-module-widgets') implementation project(':modules:mogo-module-adas') implementation project(':modules:mogo-module-back') - implementation project(':main-extensions:mogo-module-main-launcher') implementation project(':modules:mogo-module-apps') implementation project(":modules:mogo-module-push-base") implementation project(":modules:mogo-module-push") @@ -221,6 +221,7 @@ dependencies { implementation project(':test:crashreport-bugly') implementation project(':core:mogo-core-data') + implementation project(':core:function-impl:mogo-core-function-main') implementation project(':core:function-impl:mogo-core-function-obu-mogo') implementation project(':core:function-impl:mogo-core-function-smp') implementation project(':core:function-impl:mogo-core-function-hmi') diff --git a/config.gradle b/config.gradle index 1521415974..5e2395b4d1 100644 --- a/config.gradle +++ b/config.gradle @@ -225,6 +225,7 @@ ext { mogo_core_function_check : "com.mogo.eagle.core.function.impl:check:${MOGO_CORE_FUNCTION_CHECK_VERSION}", mogo_core_function_hmi : "com.mogo.eagle.core.function.impl:hmi:${MOGO_CORE_FUNCTION_HMI_VERSION}", mogo_core_function_map : "com.mogo.eagle.core.function.impl:map:${MOGO_CORE_FUNCTION_MAP_VERSION}", + mogo_core_function_main : "com.mogo.eagle.core.function.impl:main:${MOGO_CORE_FUNCTION_MAIN_VERSION}", mogo_core_function_monitoring: "com.mogo.eagle.core.function.impl:monitoring:${MOGO_CORE_FUNCTION_MONITORING_VERSION}", mogo_core_function_notice : "com.mogo.eagle.core.function.impl:notice:${MOGO_CORE_FUNCTION_NOTICE_VERSION}", mogo_core_function_obu_mogo : "com.mogo.eagle.core.function.impl:obu-mogo:${MOGO_CORE_FUNCTION_OBU_MOGO_VERSION}", diff --git a/main-extensions/mogo-module-main-launcher/.gitignore b/core/function-impl/mogo-core-function-main/.gitignore similarity index 100% rename from main-extensions/mogo-module-main-launcher/.gitignore rename to core/function-impl/mogo-core-function-main/.gitignore diff --git a/main-extensions/mogo-module-main-launcher/build.gradle b/core/function-impl/mogo-core-function-main/build.gradle similarity index 100% rename from main-extensions/mogo-module-main-launcher/build.gradle rename to core/function-impl/mogo-core-function-main/build.gradle diff --git a/main-extensions/mogo-module-main-launcher/consumer-rules.pro b/core/function-impl/mogo-core-function-main/consumer-rules.pro similarity index 100% rename from main-extensions/mogo-module-main-launcher/consumer-rules.pro rename to core/function-impl/mogo-core-function-main/consumer-rules.pro diff --git a/core/function-impl/mogo-core-function-main/gradle.properties b/core/function-impl/mogo-core-function-main/gradle.properties new file mode 100644 index 0000000000..2a2587d9c2 --- /dev/null +++ b/core/function-impl/mogo-core-function-main/gradle.properties @@ -0,0 +1,3 @@ +GROUP=com.mogo.eagle.core.function.impl +POM_ARTIFACT_ID=main +VERSION_CODE=1 diff --git a/main-extensions/mogo-module-main-launcher/proguard-rules.pro b/core/function-impl/mogo-core-function-main/proguard-rules.pro similarity index 100% rename from main-extensions/mogo-module-main-launcher/proguard-rules.pro rename to core/function-impl/mogo-core-function-main/proguard-rules.pro diff --git a/main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml b/core/function-impl/mogo-core-function-main/src/main/AndroidManifest.xml similarity index 95% rename from main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml rename to core/function-impl/mogo-core-function-main/src/main/AndroidManifest.xml index a321888931..cec93e9e67 100644 --- a/main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml +++ b/core/function-impl/mogo-core-function-main/src/main/AndroidManifest.xml @@ -1,12 +1,13 @@ + + package="com.mogo.eagle.core.function.main"> - +