update

Author: AweiLoveAndroid

JavaAndKotlinDemo/build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.30'
+    ext.kotlin_version = '1.3.0'
 
 
 

JavaAndKotlinDemo/kotlinmodule/build.gradle

@@ -28,10 +28,10 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 }

KotlinAndJavaDemo/app/build.gradle

@@ -1,7 +1,6 @@
 apply plugin: 'com.android.application'
 
 apply plugin: 'kotlin-android'
-
 apply plugin: 'kotlin-android-extensions'
 
 android {
@@ -28,11 +27,11 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation project(':javalibrary')
 }

KotlinAndJavaDemo/build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.30'
+    ext.kotlin_version = '1.3.0'
     repositories {
         google()
         jcenter()

README.md

@@ -1,2 +1,51 @@
 # Kotlin-learn
 kotlin和java混合使用总结
+
+----
+
+## 一、Kotlin项目里面集成Java的module
+
+这一部分源码请看：[https://github.com/AweiLoveAndroid/Kotlin-learn/tree/master/KotlinAndJavaDemo](https://github.com/AweiLoveAndroid/Kotlin-learn/tree/master/KotlinAndJavaDemo)
+
+----
+
+项目结构图：
+
+
+
+![](https://github.com/AweiLoveAndroid/Kotlin-learn/blob/master/pics/KotlinAndJavaDemo%E6%96%87%E4%BB%B6%E7%BB%93%E6%9E%84%E5%9B%BE.png?raw=true)
+
+
+
+#### 1.创建java的module
+
+请看源码：[https://github.com/AweiLoveAndroid/Kotlin-learn/tree/master/KotlinAndJavaDemo/javamodule](https://github.com/AweiLoveAndroid/Kotlin-learn/tree/master/KotlinAndJavaDemo/javamodule)
+
+#### 2.创建java的lib
+
+请看源码：[https://github.com/AweiLoveAndroid/Kotlin-learn/tree/master/KotlinAndJavaDemo/javalibrary](https://github.com/AweiLoveAndroid/Kotlin-learn/tree/master/KotlinAndJavaDemo/javalibrary)
+
+----
+
+
+
+## 二、Java项目里面集成Kotlin的module
+
+这一部分源码请看：[https://github.com/AweiLoveAndroid/Kotlin-learn/tree/master/JavaAndKotlinDemo](https://github.com/AweiLoveAndroid/Kotlin-learn/tree/master/JavaAndKotlinDemo)
+
+项目结构图：
+
+
+
+![](https://github.com/AweiLoveAndroid/Kotlin-learn/blob/master/pics/JavaAndKotlinDemo%E6%96%87%E4%BB%B6%E7%BB%93%E6%9E%84%E5%9B%BE.png?raw=true)
+
+
+
+#### 1.创建kotlin的module
+
+请看源码：[https://github.com/AweiLoveAndroid/Kotlin-learn/tree/master/JavaAndKotlinDemo/kotlinmodule](https://github.com/AweiLoveAndroid/Kotlin-learn/tree/master/JavaAndKotlinDemo/kotlinmodule)
+
+#### 2.创建kotlin的lib
+
+请看源码：[https://github.com/AweiLoveAndroid/Kotlin-learn/tree/master/JavaAndKotlinDemo/kotlinlibrary](https://github.com/AweiLoveAndroid/Kotlin-learn/tree/master/JavaAndKotlinDemo/kotlinlibrary)
+