diff --git a/app/build.gradle b/app/build.gradle index d89d51f..39b599f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,5 +36,4 @@ dependencies { dependencies { implementation project(":processor") annotationProcessor project(":processor") - implementation 'org.ow2.asm:asm:5.1' } diff --git a/build.gradle b/build.gradle index 5d88c77..6ba5b96 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:3.1.4' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3' + classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' if (Boolean.valueOf(applyConfigurerPlugin)) { classpath 'com.taoszu.configurer:plugin:1.0.4' diff --git a/processor/build.gradle b/processor/build.gradle index 99e5329..eb43170 100644 --- a/processor/build.gradle +++ b/processor/build.gradle @@ -1,12 +1,13 @@ apply plugin: 'java-library' - +apply plugin: 'com.github.dcendents.android-maven' dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') compile 'com.squareup:javapoet:1.9.0' - implementation 'org.ow2.asm:asm:5.1' - //implementation 'com.android.tools.build:gradle:3.1.4' } +group='com.github.taoszu' + + sourceCompatibility = "1.8" targetCompatibility = "1.8" diff --git a/processor/src/main/java/com/taoszu/configurer/processor/WorkerProcessor.java b/processor/src/main/java/com/taoszu/configurer/processor/WorkerProcessor.java index 1abe890..0cae1dc 100644 --- a/processor/src/main/java/com/taoszu/configurer/processor/WorkerProcessor.java +++ b/processor/src/main/java/com/taoszu/configurer/processor/WorkerProcessor.java @@ -86,13 +86,7 @@ private void genWorkerMap(Set elements) { private void genFactoryClass(Set elementSet, String module) { String paramName = Constant.FACTORY_METHOD_PARAM_NAME; - ParameterizedTypeName mapTypeName = ParameterizedTypeName.get( - ClassName.get(Map.class), ClassName.get(String.class), - ParameterizedTypeName.get(ClassName.get(Class.class), WildcardTypeName.subtypeOf(Object.class))); - String className = capitalize(module) + Constant.FACTORY_SUFFIX; - - ParameterSpec mapParameterSpec = ParameterSpec.builder(mapTypeName, paramName).build(); MethodSpec.Builder methodInit = MethodSpec.constructorBuilder() .addModifiers(Modifier.PUBLIC);