diff --git a/.gitignore b/.gitignore index 3e6daa7..cba909f 100644 --- a/.gitignore +++ b/.gitignore @@ -30,5 +30,3 @@ captures/ # Intellij *.iml .idea - -micro-module/ diff --git a/app/build.gradle b/app/build.gradle index f5f2198..3d4d2db 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,8 +27,10 @@ dependencies { // implementation 'com.eastwood.common:mis:1.0.0' implementation misPublication('com.eastwood.demo:library-sdk') + implementation misPublication('com.eastwood.demo:kotlin-sdk') implementation misPublication('com.eastwood.demo:module-main-sdk') implementation misPublication('com.eastwood.demo:module-common-sdk') + implementation misPublication('com.eastwood.demo:module-kotlin-sdk') // after library-sdk push to maven, you need specify a version. // e.g. diff --git a/library/build.gradle b/library/build.gradle index cc21526..f486c2b 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.library' apply plugin: 'mis' android { - compileSdkVersion 25 + compileSdkVersion 27 defaultConfig { minSdkVersion 14 - targetSdkVersion 25 + targetSdkVersion 27 versionCode 1 versionName "1.0" } diff --git a/micro-module/build.gradle b/micro-module/build.gradle index 4333022..a082ecd 100644 --- a/micro-module/build.gradle +++ b/micro-module/build.gradle @@ -2,12 +2,16 @@ apply plugin: 'micro-module' apply plugin: 'com.android.library' apply plugin: 'mis' +apply plugin: 'kotlin-android' + +apply plugin: 'kotlin-android-extensions' + android { - compileSdkVersion 25 + compileSdkVersion 27 defaultConfig { minSdkVersion 14 - targetSdkVersion 25 + targetSdkVersion 27 versionCode 1 versionName "1.0" } @@ -19,9 +23,15 @@ android { } } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + } microModule { + include ':p_kotlin' include ':p_common' @@ -30,6 +40,8 @@ microModule { dependencies { implementation 'com.eastwood.common:auto-inject:1.0.0' + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation project(':mis-core') // or // implementation 'com.eastwood.common:mis:1.0.0' diff --git a/micro-module/p_kotlin/build.gradle b/micro-module/p_kotlin/build.gradle new file mode 100644 index 0000000..bcfe77b --- /dev/null +++ b/micro-module/p_kotlin/build.gradle @@ -0,0 +1,15 @@ +// MicroModule build file where you can add configuration options to publish MicroModule(aar) to Maven +// and declare MicroModule dependencies. + +mis { + publications { + p_kotlin { + groupId 'com.eastwood.demo' + artifactId 'module-kotlin-sdk' + } + } +} + +dependencies { + implementation fileTree(dir: 'p_kotlin/libs', include: ['*.jar']) +} diff --git a/micro-module/p_kotlin/src/main/AndroidManifest.xml b/micro-module/p_kotlin/src/main/AndroidManifest.xml new file mode 100644 index 0000000..32e6779 --- /dev/null +++ b/micro-module/p_kotlin/src/main/AndroidManifest.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/micro-module/p_kotlin/src/main/kotlin/com/eastwood/demo/micromodule/kotlin/MicroModuleKotlinService.kt b/micro-module/p_kotlin/src/main/kotlin/com/eastwood/demo/micromodule/kotlin/MicroModuleKotlinService.kt new file mode 100644 index 0000000..4b7de6e --- /dev/null +++ b/micro-module/p_kotlin/src/main/kotlin/com/eastwood/demo/micromodule/kotlin/MicroModuleKotlinService.kt @@ -0,0 +1,14 @@ +package com.eastwood.demo.micromodule.kotlin + +/** + * + * @author eastwood + * createDate: 2019-01-22 + */ +class MicroModuleKotlinService : IMicroModuleKotlin { + + override fun test() { + + } + +} \ No newline at end of file diff --git a/micro-module/p_kotlin/src/main/mis/com/eastwood/demo/micromodule/kotlin/IMicroModuleKotlin.kt b/micro-module/p_kotlin/src/main/mis/com/eastwood/demo/micromodule/kotlin/IMicroModuleKotlin.kt new file mode 100644 index 0000000..60b8411 --- /dev/null +++ b/micro-module/p_kotlin/src/main/mis/com/eastwood/demo/micromodule/kotlin/IMicroModuleKotlin.kt @@ -0,0 +1,12 @@ +package com.eastwood.demo.micromodule.kotlin + +/** + * + * @author eastwood + * createDate: 2019-01-22 + */ +interface IMicroModuleKotlin { + + fun test() + +} \ No newline at end of file diff --git a/mis-core/build.gradle b/mis-core/build.gradle index 9acd186..b1c8587 100644 --- a/mis-core/build.gradle +++ b/mis-core/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 25 + compileSdkVersion 27 defaultConfig { minSdkVersion 14 - targetSdkVersion 25 + targetSdkVersion 27 versionCode 1 versionName '1.0.1' } @@ -19,7 +19,7 @@ android { } dependencies { - implementation 'com.android.support:appcompat-v7:25.1.1' + implementation 'com.android.support:appcompat-v7:27.1.1' }