diff --git a/app/build.gradle b/app/build.gradle index 88f531e77..022a6c50d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -55,14 +55,14 @@ android { jvmTarget = "1.8" } - dataBinding { - enabled = true - } +// dataBinding { +// enabled = true +// } -// buildFeatures { -// dataBinding true + buildFeatures { + dataBinding true // viewBinding true -// } + } kapt { arguments { diff --git a/app/src/main/java/me/yifeiyuan/flapdev/AsmTest.java b/app/src/main/java/me/yifeiyuan/flapdev/AsmTest.java index 42827e5df..91faabff8 100644 --- a/app/src/main/java/me/yifeiyuan/flapdev/AsmTest.java +++ b/app/src/main/java/me/yifeiyuan/flapdev/AsmTest.java @@ -6,26 +6,6 @@ /** * Created by 程序亦非猿 on 2020/9/8. - * - * todo proxy 类的名字是 me/xxx/xxxProxy - * - * L1 - * LINENUMBER 16 L1 - * ALOAD 2 - * NEW me/yifeiyuan/flap/apt/proxies/SimpleTextComponentProxy - * DUP - * INVOKESPECIAL me/yifeiyuan/flap/apt/proxies/SimpleTextComponentProxy. ()V - * INVOKEVIRTUAL me/yifeiyuan/flap/Flap.register (Lme/yifeiyuan/flap/internal/ComponentProxy;)Lme/yifeiyuan/flap/ComponentRegistry; - * POP - * L2 - * LINENUMBER 18 L2 - * ALOAD 2 - * NEW me/yifeiyuan/flap/apt/proxies/SimpleImageComponentProxy - * DUP - * INVOKESPECIAL me/yifeiyuan/flap/apt/proxies/SimpleImageComponentProxy. ()V - * INVOKEVIRTUAL me/yifeiyuan/flap/Flap.register (Lme/yifeiyuan/flap/internal/ComponentProxy;)Lme/yifeiyuan/flap/ComponentRegistry; - * POP - * */ class AsmTest { diff --git a/build.gradle b/build.gradle index 33b954a29..f877d4e00 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:4.0.1' //https://github.com/StefMa/bintray-release classpath "guru.stefma.bintrayrelease:bintrayrelease:1.1.1" classpath 'com.novoda:bintray-release:0.9' diff --git a/flap-compiler/build.gradle b/flap-compiler/build.gradle index d6abd6718..61b28e7d1 100644 --- a/flap-compiler/build.gradle +++ b/flap-compiler/build.gradle @@ -4,7 +4,8 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':flap-annotations') implementation 'com.squareup:javapoet:1.11.1' - implementation 'com.google.auto.service:auto-service:1.0-rc6' + api 'com.google.auto.service:auto-service:1.0-rc6' + annotationProcessor 'com.google.auto.service:auto-service:1.0-rc6' } sourceCompatibility = "7" @@ -16,7 +17,7 @@ publish { userOrg = 'alancheen' groupId = 'me.yifeiyuan.flap' artifactId = 'flap-compiler' - publishVersion = '2.1.0' + publishVersion = '2.1.1' desc = 'flap annotations' website = 'https://github.com/AlanCheen/Flap' } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9a4163a4f..4e1cc9db6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists