v1.0.11

xuyingjun · xuyingjun · commit 067d4b828e74 · 2019-10-16T14:58:28.000+08:00
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -41,4 +41,8 @@
 
 ## 1.0.10
 
-* add Log
+* add Log
+
+## 1.0.11
+
+* remove kotlin
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ Global dialog function encapsulation, with a semantic way to fill the content in
 
 ```yaml
 dependencies:
-  flutter_custom_dialog: ^1.0.10
+  flutter_custom_dialog: ^1.0.11
 ```
 
 **2、import**
diff --git a/README_CN.md b/README_CN.md
@@ -15,7 +15,7 @@
 
 ```yaml
 dependencies:
-  flutter_custom_dialog: ^1.0.10
+  flutter_custom_dialog: ^1.0.11
 ```
 
 **2、import**
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,16 +1,14 @@
-group 'inc.yy.flutter_custom_dialog'
+group 'yy.inc.flutter_custom_dialog'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.3.0'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
@@ -22,14 +20,10 @@ rootProject.allprojects {
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion 28
 
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
     defaultConfig {
         minSdkVersion 16
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -38,7 +32,3 @@ android {
         disable 'InvalidPackage'
     }
 }
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -1,3 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="inc.yy.flutter_custom_dialog">
+  package="yy.inc.flutter_custom_dialog">
 </manifest>
diff --git a/android/src/main/java/inc/yy/flutter_custom_dialog/FlutterCustomDialogPlugin.java b/android/src/main/java/inc/yy/flutter_custom_dialog/FlutterCustomDialogPlugin.java
@@ -0,0 +1,25 @@
+package yy.inc.flutter_custom_dialog;
+
+import io.flutter.plugin.common.MethodCall;
+import io.flutter.plugin.common.MethodChannel;
+import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
+import io.flutter.plugin.common.MethodChannel.Result;
+import io.flutter.plugin.common.PluginRegistry.Registrar;
+
+/** FlutterCustomDialogPlugin */
+public class FlutterCustomDialogPlugin implements MethodCallHandler {
+  /** Plugin registration. */
+  public static void registerWith(Registrar registrar) {
+    final MethodChannel channel = new MethodChannel(registrar.messenger(), "flutter_custom_dialog");
+    channel.setMethodCallHandler(new FlutterCustomDialogPlugin());
+  }
+
+  @Override
+  public void onMethodCall(MethodCall call, Result result) {
+    if (call.method.equals("getPlatformVersion")) {
+      result.success("Android " + android.os.Build.VERSION.RELEASE);
+    } else {
+      result.notImplemented();
+    }
+  }
+}
diff --git a/android/src/main/kotlin/inc/yy/flutter_custom_dialog/FlutterCustomDialogPlugin.kt b/android/src/main/kotlin/inc/yy/flutter_custom_dialog/FlutterCustomDialogPlugin.kt
diff --git a/flutter_custom_dialog.iml b/flutter_custom_dialog.iml
@@ -12,6 +12,7 @@
       <excludeFolder url="file://$MODULE_DIR$/example/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/example/build" />
     </content>
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Dart SDK" level="project" />
     <orderEntry type="library" name="Flutter Plugins" level="project" />
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_custom_dialog
 description: Semantic dialog
-version: 1.0.10
+version: 1.0.11
 author: AndroidHensen <xyj510402535@qq.com>
 homepage: https://github.com/YYFlutter/flutter-custom-dialog.git
 
@@ -25,7 +25,7 @@ flutter:
   # be modified. They are used by the tooling to maintain consistency when
   # adding or updating assets for this project.
   plugin:
-    androidPackage: inc.yy.flutter_custom_dialog
+    androidPackage: yy.inc.flutter_custom_dialog
     pluginClass: FlutterCustomDialogPlugin
 
   # To add assets to your plugin package, add an assets section, like this:

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,14 @@`
`1`		`-group 'inc.yy.flutter_custom_dialog'`
	`1`	`+group 'yy.inc.flutter_custom_dialog'`
`2`	`2`	`version '1.0-SNAPSHOT'`
`3`	`3`
`4`	`4`	`buildscript {`
`5`		`- ext.kotlin_version = '1.3.0'`
`6`	`5`	`repositories {`
`7`	`6`	`google()`
`8`	`7`	`jcenter()`
`9`	`8`	`}`
`10`	`9`
`11`	`10`	`dependencies {`
`12`	`11`	`classpath 'com.android.tools.build:gradle:3.2.1'`
`13`		`- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`14`	`12`	`}`
`15`	`13`	`}`
`16`	`14`
`@@ -22,14 +20,10 @@ rootProject.allprojects {`
`22`	`20`	`}`
`23`	`21`
`24`	`22`	`apply plugin: 'com.android.library'`
`25`		`-apply plugin: 'kotlin-android'`
`26`	`23`
`27`	`24`	`android {`
`28`	`25`	`compileSdkVersion 28`
`29`	`26`
`30`		`- sourceSets {`
`31`		`- main.java.srcDirs += 'src/main/kotlin'`
`32`		`- }`
`33`	`27`	`defaultConfig {`
`34`	`28`	`minSdkVersion 16`
`35`	`29`	`testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"`
`@@ -38,7 +32,3 @@ android {`
`38`	`32`	`disable 'InvalidPackage'`
`39`	`33`	`}`
`40`	`34`	`}`
`41`		`-`
`42`		`-dependencies {`
`43`		`- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"`
`44`		`-}`