From 4e96487bb749d7a4db35d64e91cd4c0a79b46fff Mon Sep 17 00:00:00 2001 From: Fitz Date: Mon, 31 Oct 2022 14:39:51 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=8B=AC=E7=AB=8B=20animation=20=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 1 + flap-animation/.gitignore | 1 + flap-animation/build.gradle | 49 +++++++++++++++++++ flap-animation/consumer-rules.pro | 0 flap-animation/proguard-rules.pro | 21 ++++++++ .../flap/animation/ExampleInstrumentedTest.kt | 24 +++++++++ flap-animation/src/main/AndroidManifest.xml | 5 ++ .../flap/animation/AlphaInAdapterAnimation.kt | 0 .../flap/animation/BaseAdapterAnimation.kt | 0 .../flap/animation/ScaleInAdapterAnimation.kt | 0 .../SlideInBottomAdapterAnimation.kt | 0 .../animation/SlideInLeftAdapterAnimation.kt | 0 .../animation/SlideInRightAdapterAnimation.kt | 0 .../flap/animation/ExampleUnitTest.kt | 17 +++++++ flap-dsl-viewbinding/build.gradle | 2 + settings.gradle | 1 + 16 files changed, 121 insertions(+) create mode 100644 flap-animation/.gitignore create mode 100644 flap-animation/build.gradle create mode 100644 flap-animation/consumer-rules.pro create mode 100644 flap-animation/proguard-rules.pro create mode 100644 flap-animation/src/androidTest/java/me/yifeiyuan/flap/animation/ExampleInstrumentedTest.kt create mode 100644 flap-animation/src/main/AndroidManifest.xml rename {flap => flap-animation}/src/main/java/me/yifeiyuan/flap/animation/AlphaInAdapterAnimation.kt (100%) rename {flap => flap-animation}/src/main/java/me/yifeiyuan/flap/animation/BaseAdapterAnimation.kt (100%) rename {flap => flap-animation}/src/main/java/me/yifeiyuan/flap/animation/ScaleInAdapterAnimation.kt (100%) rename {flap => flap-animation}/src/main/java/me/yifeiyuan/flap/animation/SlideInBottomAdapterAnimation.kt (100%) rename {flap => flap-animation}/src/main/java/me/yifeiyuan/flap/animation/SlideInLeftAdapterAnimation.kt (100%) rename {flap => flap-animation}/src/main/java/me/yifeiyuan/flap/animation/SlideInRightAdapterAnimation.kt (100%) create mode 100644 flap-animation/src/test/java/me/yifeiyuan/flap/animation/ExampleUnitTest.kt diff --git a/app/build.gradle b/app/build.gradle index 263f0e3d4..54e0b6751 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -97,6 +97,7 @@ dependencies { implementation project(':ktmodule') implementation project(':flap') + implementation project(':flap-animation') implementation project(':flap-dsl-viewbinding') implementation project(':flap-dsl-databinding') implementation project(':flap-annotations') diff --git a/flap-animation/.gitignore b/flap-animation/.gitignore new file mode 100644 index 000000000..42afabfd2 --- /dev/null +++ b/flap-animation/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/flap-animation/build.gradle b/flap-animation/build.gradle new file mode 100644 index 000000000..a68e6d072 --- /dev/null +++ b/flap-animation/build.gradle @@ -0,0 +1,49 @@ +plugins { + id 'com.android.library' + id 'kotlin-android' +} + +apply plugin: 'com.github.dcendents.android-maven' + +group = 'me.yifeiyuan' + +android { + compileSdkVersion 29 + + defaultConfig { + minSdkVersion 17 + targetSdkVersion 29 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = '1.8' + } +} + +dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + + compileOnly 'androidx.recyclerview:recyclerview:1.2.1' + compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + compileOnly project(':flap') +} \ No newline at end of file diff --git a/flap-animation/consumer-rules.pro b/flap-animation/consumer-rules.pro new file mode 100644 index 000000000..e69de29bb diff --git a/flap-animation/proguard-rules.pro b/flap-animation/proguard-rules.pro new file mode 100644 index 000000000..481bb4348 --- /dev/null +++ b/flap-animation/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/flap-animation/src/androidTest/java/me/yifeiyuan/flap/animation/ExampleInstrumentedTest.kt b/flap-animation/src/androidTest/java/me/yifeiyuan/flap/animation/ExampleInstrumentedTest.kt new file mode 100644 index 000000000..22c339ad1 --- /dev/null +++ b/flap-animation/src/androidTest/java/me/yifeiyuan/flap/animation/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package me.yifeiyuan.flap.animation + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("me.yifeiyuan.flap.animation.test", appContext.packageName) + } +} \ No newline at end of file diff --git a/flap-animation/src/main/AndroidManifest.xml b/flap-animation/src/main/AndroidManifest.xml new file mode 100644 index 000000000..5644fc5d9 --- /dev/null +++ b/flap-animation/src/main/AndroidManifest.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/flap/src/main/java/me/yifeiyuan/flap/animation/AlphaInAdapterAnimation.kt b/flap-animation/src/main/java/me/yifeiyuan/flap/animation/AlphaInAdapterAnimation.kt similarity index 100% rename from flap/src/main/java/me/yifeiyuan/flap/animation/AlphaInAdapterAnimation.kt rename to flap-animation/src/main/java/me/yifeiyuan/flap/animation/AlphaInAdapterAnimation.kt diff --git a/flap/src/main/java/me/yifeiyuan/flap/animation/BaseAdapterAnimation.kt b/flap-animation/src/main/java/me/yifeiyuan/flap/animation/BaseAdapterAnimation.kt similarity index 100% rename from flap/src/main/java/me/yifeiyuan/flap/animation/BaseAdapterAnimation.kt rename to flap-animation/src/main/java/me/yifeiyuan/flap/animation/BaseAdapterAnimation.kt diff --git a/flap/src/main/java/me/yifeiyuan/flap/animation/ScaleInAdapterAnimation.kt b/flap-animation/src/main/java/me/yifeiyuan/flap/animation/ScaleInAdapterAnimation.kt similarity index 100% rename from flap/src/main/java/me/yifeiyuan/flap/animation/ScaleInAdapterAnimation.kt rename to flap-animation/src/main/java/me/yifeiyuan/flap/animation/ScaleInAdapterAnimation.kt diff --git a/flap/src/main/java/me/yifeiyuan/flap/animation/SlideInBottomAdapterAnimation.kt b/flap-animation/src/main/java/me/yifeiyuan/flap/animation/SlideInBottomAdapterAnimation.kt similarity index 100% rename from flap/src/main/java/me/yifeiyuan/flap/animation/SlideInBottomAdapterAnimation.kt rename to flap-animation/src/main/java/me/yifeiyuan/flap/animation/SlideInBottomAdapterAnimation.kt diff --git a/flap/src/main/java/me/yifeiyuan/flap/animation/SlideInLeftAdapterAnimation.kt b/flap-animation/src/main/java/me/yifeiyuan/flap/animation/SlideInLeftAdapterAnimation.kt similarity index 100% rename from flap/src/main/java/me/yifeiyuan/flap/animation/SlideInLeftAdapterAnimation.kt rename to flap-animation/src/main/java/me/yifeiyuan/flap/animation/SlideInLeftAdapterAnimation.kt diff --git a/flap/src/main/java/me/yifeiyuan/flap/animation/SlideInRightAdapterAnimation.kt b/flap-animation/src/main/java/me/yifeiyuan/flap/animation/SlideInRightAdapterAnimation.kt similarity index 100% rename from flap/src/main/java/me/yifeiyuan/flap/animation/SlideInRightAdapterAnimation.kt rename to flap-animation/src/main/java/me/yifeiyuan/flap/animation/SlideInRightAdapterAnimation.kt diff --git a/flap-animation/src/test/java/me/yifeiyuan/flap/animation/ExampleUnitTest.kt b/flap-animation/src/test/java/me/yifeiyuan/flap/animation/ExampleUnitTest.kt new file mode 100644 index 000000000..c1dd63671 --- /dev/null +++ b/flap-animation/src/test/java/me/yifeiyuan/flap/animation/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package me.yifeiyuan.flap.animation + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/flap-dsl-viewbinding/build.gradle b/flap-dsl-viewbinding/build.gradle index 1f063c565..ad97d2082 100644 --- a/flap-dsl-viewbinding/build.gradle +++ b/flap-dsl-viewbinding/build.gradle @@ -26,10 +26,12 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + kotlinOptions { jvmTarget = '1.8' } diff --git a/settings.gradle b/settings.gradle index 0b8b21216..e652cce43 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,4 @@ +include ':flap-animation' include ':flap-dsl-databinding' include ':flap-dsl-viewbinding' include ':ktmodule' From 62022c49b4b6f8d6e19f9d4fffd7eaf69402c4ba Mon Sep 17 00:00:00 2001 From: Fitz Date: Mon, 31 Oct 2022 15:10:22 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20ktsdtlib=20=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 ---- flap-animation/build.gradle | 1 - flap-dsl-databinding/build.gradle | 2 +- flap-dsl-viewbinding/build.gradle | 2 +- flap/build.gradle | 7 ++++--- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 54e0b6751..694d2ad98 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -104,10 +104,6 @@ dependencies { // implementation project(':flap-gradle-plugin') kapt project(':flap-compiler') -// implementation 'me.yifeiyuan.flap:flap-annotations:2.0.0' -// implementation 'me.yifeiyuan.flap:flap:2.0.0' -// kapt 'me.yifeiyuan.flap:flap-compiler:2.0.0' - implementation 'jp.wasabeef:recyclerview-animators:4.0.2' // implementation 'com.google.code.gson:gson:2.9.1' diff --git a/flap-animation/build.gradle b/flap-animation/build.gradle index a68e6d072..10abec30f 100644 --- a/flap-animation/build.gradle +++ b/flap-animation/build.gradle @@ -44,6 +44,5 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' compileOnly 'androidx.recyclerview:recyclerview:1.2.1' - compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" compileOnly project(':flap') } \ No newline at end of file diff --git a/flap-dsl-databinding/build.gradle b/flap-dsl-databinding/build.gradle index f96f285eb..7d8db19fd 100644 --- a/flap-dsl-databinding/build.gradle +++ b/flap-dsl-databinding/build.gradle @@ -40,12 +40,12 @@ android { } dependencies { + compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' compileOnly 'androidx.recyclerview:recyclerview:1.2.1' - compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" compileOnly project(':flap') } \ No newline at end of file diff --git a/flap-dsl-viewbinding/build.gradle b/flap-dsl-viewbinding/build.gradle index ad97d2082..d4f5d9429 100644 --- a/flap-dsl-viewbinding/build.gradle +++ b/flap-dsl-viewbinding/build.gradle @@ -42,12 +42,12 @@ android { } dependencies { + compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' compileOnly 'androidx.recyclerview:recyclerview:1.2.1' - compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" compileOnly project(':flap') } \ No newline at end of file diff --git a/flap/build.gradle b/flap/build.gradle index 1f450ccc2..cf0cb31c7 100644 --- a/flap/build.gradle +++ b/flap/build.gradle @@ -41,7 +41,8 @@ dependencies { testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' - implementation 'androidx.recyclerview:recyclerview:1.2.1' - implementation "androidx.core:core-ktx:1.6.0" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + compileOnly 'androidx.recyclerview:recyclerview:1.2.1' + compileOnly "androidx.core:core-ktx:1.6.0" + + compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } \ No newline at end of file From 5f73aad79306d8a7331bb94befee3b2d8d0a5f5d Mon Sep 17 00:00:00 2001 From: Fitz Date: Mon, 31 Oct 2022 16:02:23 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=94=B9=E4=B8=BA=20kapt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 694d2ad98..a9e79a4aa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -108,5 +108,5 @@ dependencies { // implementation 'com.google.code.gson:gson:2.9.1' implementation 'com.github.bumptech.glide:glide:4.13.2' - annotationProcessor 'com.github.bumptech.glide:compiler:4.13.2' + kapt 'com.github.bumptech.glide:compiler:4.13.2' } From 1da99c0085adc4c38ec9e65ef76bcda3fd9b181e Mon Sep 17 00:00:00 2001 From: Fitz Date: Mon, 31 Oct 2022 16:06:29 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=B8=8D=E5=86=8D=E7=BC=96=E8=AF=91=20flap?= =?UTF-8?q?-gradle-plugin=20=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flap-dsl-databinding/build.gradle | 5 ++--- flap-dsl-viewbinding/build.gradle | 4 +--- settings.gradle | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/flap-dsl-databinding/build.gradle b/flap-dsl-databinding/build.gradle index 7d8db19fd..7718eb66f 100644 --- a/flap-dsl-databinding/build.gradle +++ b/flap-dsl-databinding/build.gradle @@ -30,6 +30,7 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + kotlinOptions { jvmTarget = '1.8' } @@ -40,12 +41,10 @@ android { } dependencies { - compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' compileOnly 'androidx.recyclerview:recyclerview:1.2.1' - compileOnly project(':flap') + api project(':flap') } \ No newline at end of file diff --git a/flap-dsl-viewbinding/build.gradle b/flap-dsl-viewbinding/build.gradle index d4f5d9429..9a83ce5ef 100644 --- a/flap-dsl-viewbinding/build.gradle +++ b/flap-dsl-viewbinding/build.gradle @@ -42,12 +42,10 @@ android { } dependencies { - compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' compileOnly 'androidx.recyclerview:recyclerview:1.2.1' - compileOnly project(':flap') + api project(':flap') } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index e652cce43..cdc5c81bb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,7 +2,7 @@ include ':flap-animation' include ':flap-dsl-databinding' include ':flap-dsl-viewbinding' include ':ktmodule' -include ':flap-gradle-plugin' +//include ':flap-gradle-plugin' include ':app' include ':flap' include ':flap-annotations' From 370987bc63093ec266c58e2414de15ef180aa833 Mon Sep 17 00:00:00 2001 From: Fitz Date: Mon, 31 Oct 2022 17:10:47 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 46 ++++++++++--------- .../me/yifeiyuan/flapdev/components/Banner.kt | 3 -- .../flapdev/testcases/ViewPager2Testcase.kt | 4 -- build.gradle | 6 +-- flap-compiler/build.gradle | 4 +- ktmodule/build.gradle | 19 +++++--- 6 files changed, 42 insertions(+), 40 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a9e79a4aa..64431d6cc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,27 +1,31 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' -apply plugin: 'kotlin-kapt' +//apply plugin: 'kotlin-android-extensions' +//apply plugin: 'kotlin-kapt' -//apply plugin: 'me.yifeiyuan.flap.plugin' - -buildscript { - repositories { - - maven { - url = "$rootProject.projectDir/repos" - } +plugins { + id 'com.android.application' + id 'kotlin-android' + id 'kotlin-kapt' +} - google() - jcenter() - } +//apply plugin: 'me.yifeiyuan.flap.plugin' - dependencies { - //添加插件 -// classpath files("../flap-gradle-plugin/build/generated/libs/flap-gradle-plugin.jar") -// classpath "me.yifeiyuan.flap:plugin:1.1.0-test" - } -} +//buildscript { +// repositories { +// +// maven { +// url = "$rootProject.projectDir/repos" +// } +// +// google() +// jcenter() +// } +// +// dependencies { +// //添加插件 +//// classpath files("../flap-gradle-plugin/build/generated/libs/flap-gradle-plugin.jar") +//// classpath "me.yifeiyuan.flap:plugin:1.1.0-test" +// } +//} android { compileSdkVersion 29 diff --git a/app/src/main/java/me/yifeiyuan/flapdev/components/Banner.kt b/app/src/main/java/me/yifeiyuan/flapdev/components/Banner.kt index 643ef0f52..05be941b2 100644 --- a/app/src/main/java/me/yifeiyuan/flapdev/components/Banner.kt +++ b/app/src/main/java/me/yifeiyuan/flapdev/components/Banner.kt @@ -1,15 +1,12 @@ package me.yifeiyuan.flapdev.components -import android.util.Log import android.widget.ImageView import androidx.viewpager2.widget.ViewPager2 import com.bumptech.glide.Glide -import kotlinx.android.synthetic.main.fragment_base_case.view.* import me.yifeiyuan.flap.FlapAdapter import me.yifeiyuan.flap.dsl.adapterDelegate import me.yifeiyuan.flapdev.FlapApplication.Companion.toast import me.yifeiyuan.flapdev.R -import me.yifeiyuan.flapdev.enforceSingleScrollDirection /** * Created by 程序亦非猿 on 2022/9/11. diff --git a/app/src/main/java/me/yifeiyuan/flapdev/testcases/ViewPager2Testcase.kt b/app/src/main/java/me/yifeiyuan/flapdev/testcases/ViewPager2Testcase.kt index 916ec8333..73a453af0 100644 --- a/app/src/main/java/me/yifeiyuan/flapdev/testcases/ViewPager2Testcase.kt +++ b/app/src/main/java/me/yifeiyuan/flapdev/testcases/ViewPager2Testcase.kt @@ -3,17 +3,13 @@ package me.yifeiyuan.flapdev.testcases import android.os.Bundle import android.view.* import android.widget.Toast -import androidx.core.view.get import androidx.fragment.app.Fragment -import androidx.recyclerview.widget.RecyclerView import androidx.viewpager2.widget.ViewPager2 -import kotlinx.android.synthetic.main.fragment_base_case.view.* import me.yifeiyuan.flap.FlapAdapter import me.yifeiyuan.flap.ext.doOnCreateViewHolderEnd import me.yifeiyuan.flapdev.R import me.yifeiyuan.flapdev.Scrollable import me.yifeiyuan.flapdev.components.SimpleTextModel -import me.yifeiyuan.flapdev.enforceSingleScrollDirection import java.util.* /** diff --git a/build.gradle b/build.gradle index 5c7e98358..3433e04e4 100644 --- a/build.gradle +++ b/build.gradle @@ -7,9 +7,9 @@ buildscript { google() jcenter() - maven { - url = "$rootProject.projectDir/repos" - } +// maven { +// url = "$rootProject.projectDir/repos" +// } } dependencies { diff --git a/flap-compiler/build.gradle b/flap-compiler/build.gradle index 98cb066bf..fec5f3b1d 100644 --- a/flap-compiler/build.gradle +++ b/flap-compiler/build.gradle @@ -9,8 +9,8 @@ dependencies { implementation project(':flap-annotations') implementation 'com.squareup:javapoet:1.11.1' // implementation 'com.squareup:kotlinpoet:1.10.1' - api 'com.google.auto.service:auto-service:1.0-rc6' - annotationProcessor 'com.google.auto.service:auto-service:1.0-rc6' + api 'com.google.auto.service:auto-service:1.0-rc7' + annotationProcessor 'com.google.auto.service:auto-service:1.0-rc7' implementation 'com.google.guava:guava:21.0' } diff --git a/ktmodule/build.gradle b/ktmodule/build.gradle index f5bb3c83a..68e616347 100644 --- a/ktmodule/build.gradle +++ b/ktmodule/build.gradle @@ -1,15 +1,20 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' -apply plugin: 'kotlin-kapt' +//apply plugin: 'com.android.library' +//apply plugin: 'kotlin-android' +//apply plugin: 'kotlin-android-extensions' +//apply plugin: 'kotlin-kapt' + +plugins { + id 'com.android.library' + id 'kotlin-android' + id 'kotlin-kapt' +} android { - compileSdkVersion 30 - buildToolsVersion "30.0.0" + compileSdkVersion 29 defaultConfig { minSdkVersion 17 - targetSdkVersion 30 + targetSdkVersion 29 versionCode 1 versionName "1.0" From 4bfde1245ee2c21a1719859f19abcafb436b046c Mon Sep 17 00:00:00 2001 From: Fitz Date: Mon, 31 Oct 2022 17:41:42 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=20mavenCentral?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 3433e04e4..e3716561a 100644 --- a/build.gradle +++ b/build.gradle @@ -5,8 +5,8 @@ buildscript { repositories { google() - jcenter() - + mavenCentral() +// jcenter() // maven { // url = "$rootProject.projectDir/repos" // } @@ -22,7 +22,8 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() +// jcenter() maven { url 'https://jitpack.io' } } }