修改gradle配置

Author: Ayvytr

.github/workflows/android.yml

@@ -1,4 +1,4 @@
-name: Android check, lint and assemble
+name: Android CI
 
 on:
   push:
@@ -13,24 +13,27 @@ jobs:
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - uses: gradle/gradle-build-action@v2
-        with:
-          gradle-version: 6.7.1
-          arguments: build --dry-run # just test build configuration
+      - name: Checkout code
+        uses: actions/checkout@v6
 
-      - uses: gradle/gradle-build-action@v2
-        with:
-          gradle-version: 6.7.1
-          arguments: check
-      - uses: gradle/gradle-build-action@v2
+      - name: Setup JDK
+        uses: actions/setup-java@v5
         with:
-          gradle-version: 6.7.1
-          arguments: lint
-      - uses: gradle/gradle-build-action@v2
-        with:
-          gradle-version: 6.7.1
-          arguments: assembleRelease
+          java-version: '17'
+          distribution: 'zulu'
+          cache: 'gradle' # 启用 Gradle 依赖缓存
+
+      - name: Make gradlew executable
+        run: chmod +x gradlew
+
+      - name: Execute Gradle tasks
+        uses: gradle/actions/setup-gradle@v5
+
+      - name: Build with Gradle
+        run: ./gradlew --dry-run
+
+      #      - name: Build with Gradle
+      #        run: ./gradlew lint
+
+      - name: Build with Gradle
+        run: ./gradlew assembleRelease

.github/workflows/github-page.yml

@@ -11,23 +11,33 @@ jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
     steps:
-      # 拉取代码
+      # 1. 拉取代码（包括 Gradle Wrapper）
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
 
-      - name: Set up the Java JDK
-        uses: actions/setup-java@v2
+      # 2. 设置 Java 环境
+      - name: Set up Java
+        uses: actions/setup-java@v4
         with:
-          java-version: '11'
-          distribution: 'adopt'
+          java-version: '17'
+          distribution: 'zulu'
+
+      # 3. （可选但推荐）设置 Gradle 环境并利用其缓存优化
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4 # 使用新的官方 Action 并省略 gradle-version 参数
+        # 注意这里移除了 with: gradle-version 配置
+
+      - name: Make gradlew executable
+        run: chmod +x gradlew
 
       # 生成javadoc
-      - uses: gradle/gradle-build-action@v2
-        with:
-          gradle-version: 6.7.1
-          arguments: custom-views-androidx:javadoc
+        uses: gradle/actions/setup-gradle@v4 # 使用新的官方 Action 并省略 gradle-version 参数
+
+      - name: Generate Javadoc with Gradle Wrapper
+        run: ./gradlew javaDocReleaseGeneration
+
 
       # 部署到 GitHub Pages
       - name: Deploy
@@ -36,6 +46,6 @@ jobs:
           ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
           REPOSITORY_NAME: ayvytr/ayvytr.github.io
           BRANCH: master
-          FOLDER: ./custom-views-androidx/build/docs/javadoc
+          FOLDER: ./custom-views-androidx/build/intermediates/java_doc_dir/release/javaDocReleaseGeneration
           CLEAN: false
           TARGET_FOLDER: javadocs/custom-views-androidx

app/build.gradle

@@ -5,6 +5,7 @@ plugins {
 
 android {
     compileSdkVersion 31
+    namespace "com.ayvytr.customviewproject"
 
     defaultConfig {
         applicationId "com.ayvytr.customviewproject"

cardviewpager/build.gradle

@@ -5,6 +5,7 @@ plugins {
 
 android {
     compileSdkVersion 31
+    namespace "com.ayvytr.cardviewpager"
 
 
 

custom-views-androidx/build.gradle

@@ -1,10 +1,13 @@
 plugins {
     alias(libs.plugins.android.library)
     id "com.vanniktech.maven.publish" version "0.35.0"
+    alias(libs.plugins.dokka)
+
 }
 
 android {
     compileSdkVersion 31
+    namespace "com.ayvytr.customview"
 
     defaultConfig {
         minSdkVersion 14

custom-views-androidx/src/main/java/com/ayvytr/customview/custom/text/ClearableEditText.java

@@ -10,16 +10,16 @@
 import android.view.MotionEvent;
 import android.view.View;
 
+import com.ayvytr.customview.R;
+import com.ayvytr.customview.util.DensityUtil;
+import com.ayvytr.customview.util.ResUtil;
+
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.AppCompatEditText;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 
-import com.ayvytr.customview.R;
-import com.ayvytr.customview.util.DensityUtil;
-import com.ayvytr.customview.util.ResUtil;
-
 
 /**
  * 可清除文本的EditText，清除图标是drawableRight指定的。预览会看不到图，运行起来会显示，直接继承的AppCompatEditText.
@@ -42,7 +42,7 @@ public ClearableEditText(Context context) {
     }
 
     public ClearableEditText(Context context, AttributeSet attrs) {
-        this(context, attrs, R.attr.editTextStyle);
+        this(context, attrs, 0);
     }
 
     public ClearableEditText(Context context, AttributeSet attrs, int defStyleAttr) {

gradle/libs.versions.toml

@@ -7,6 +7,7 @@ junitVersion = "1.1.5"
 espressoCore = "3.5.1"
 appcompat = "1.3.0"
 material = "1.10.0"
+dokka = "2.1.0"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -34,3 +35,4 @@ ktx-androidx = 'io.github.ayvytr:ktx-androidx:+'
 android-application = { id = "com.android.application", version.ref = "agp" }
 android-library= { id = "com.android.library", version.ref = "agp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+dokka = {id = "org.jetbrains.dokka", version.ref =  "dokka" }