ci打包

yatoooon · yatoooon · commit 97d3d085718f · 2023-08-07T16:58:23.000+08:00
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -13,10 +13,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: set up JDK 8
+      - name: set up JDK 11
         uses: actions/setup-java@v2
         with:
-          java-version: '8'
+          java-version: '11'
           distribution: 'temurin'
           cache: gradle
 
diff --git a/buildSrc/src/main/java/com/common/plugin/CommonPlugins.kt b/buildSrc/src/main/java/com/common/plugin/CommonPlugins.kt
@@ -17,7 +17,7 @@ internal fun Project.configurePlugins(isAppModule: Boolean) {
     plugins.apply("dagger.hilt.android.plugin")
     plugins.apply("io.github.wurensen.android-aspectjx")
     var options = mutableMapOf<String, String>().apply {
-        @Suppress("MISSING_DEPENDENCY_CLASS") put("from", "${project.rootDir}/build_app.gradle")
+        @Suppress("MISSING_DEPENDENCY_CLASS") put("from", "${project.rootDir}/build_android.gradle")
     }
     apply(options)
 
diff --git a/build_android.gradle b/build_android.gradle

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ internal fun Project.configurePlugins(isAppModule: Boolean) {`
`17`	`17`	`plugins.apply("dagger.hilt.android.plugin")`
`18`	`18`	`plugins.apply("io.github.wurensen.android-aspectjx")`
`19`	`19`	`var options = mutableMapOf<String, String>().apply {`
`20`		`- @Suppress("MISSING_DEPENDENCY_CLASS") put("from", "${project.rootDir}/build_app.gradle")`
	`20`	`+ @Suppress("MISSING_DEPENDENCY_CLASS") put("from", "${project.rootDir}/build_android.gradle")`
`21`	`21`	`}`
`22`	`22`	`apply(options)`
`23`	`23`