module fixes

usefulness · Nov 14, 2023 · 792a3c7 · 792a3c7
1 parent df5b7cb
commit 792a3c7
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 7 deletions.
diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
@@ -42,26 +42,38 @@ jobs:
         with:
           arguments: assemble -m
 
-      - id: dependency-diff
+      - id: dependency-diff-gradle
         name: Generate dependency diff
         uses: usefulness/dependency-tree-diff-action@v1
         with:
           project: licensee-for-android
           configuration: 'runtimeClasspath'
 
+      - id: dependency-diff-core
+        name: Generate dependency diff
+        uses: usefulness/dependency-tree-diff-action@v1
+        with:
+          project: licensee-for-android-core
+          configuration: 'runtimeClasspath'
+
       - uses: peter-evans/find-comment@v2
         id: find_comment
         with:
           issue-number: ${{ github.event.pull_request.number }}
           body-includes: Dependency diff
 
       - uses: peter-evans/create-or-update-comment@v3
-        if: ${{ steps.dependency-diff.outputs.text-diff != null || steps.find_comment.outputs.comment-id != null }}
+        if: ${{ steps.dependency-diff-gradle.outputs.text-diff != null || steps.dependency-diff-core.outputs.text-diff != null || steps.find_comment.outputs.comment-id != null }}
         with:
           body: |
-            Dependency diff:
+            Dependency diff (Gradle plugin):
+              ```diff
+              ${{ steps.dependency-diff-gradle.outputs.text-diff }}
+              ```
+            
+            Dependency diff (core library):
               ```diff
-              ${{ steps.dependency-diff.outputs.text-diff }}
+              ${{ steps.dependency-diff-core.outputs.text-diff }}
               ```
           edit-mode: replace
           comment-id: ${{ steps.find_comment.outputs.comment-id }}

diff --git a/gradle.properties b/gradle.properties
@@ -2,4 +2,3 @@ kotlin.code.style=official
 org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.jvmargs="-XX:+UseParallelGC"
-kotlin.stdlib.default.dependency=false
diff --git a/images/generated_code_dark.png b/images/generated_code_dark.png
diff --git a/images/generated_code_light.png b/images/generated_code_light.png
diff --git a/licensee-for-android-core/build.gradle b/licensee-for-android-core/build.gradle
@@ -12,6 +12,10 @@ kotlin {
     explicitApi()
 }
 
+poko {
+    pokoAnnotation.set "io.github.usefulness.licensee.Poko"
+}
+
 def targetVersion = JavaVersion.VERSION_1_8
 tasks.withType(KotlinCompile).configureEach {
     it.kotlinOptions.jvmTarget = targetVersion.toString()

diff --git a/licensee-for-android-core/src/main/kotlin/io/github/usefulness/licensee/Artifact.kt b/licensee-for-android-core/src/main/kotlin/io/github/usefulness/licensee/Artifact.kt
@@ -1,7 +1,5 @@
 package io.github.usefulness.licensee
 
-import dev.drewhamilton.poko.Poko
-
 @Poko
 public class Artifact(
     public val groupId: String,

diff --git a/licensee-for-android-core/src/main/kotlin/io/github/usefulness/licensee/Poko.kt b/licensee-for-android-core/src/main/kotlin/io/github/usefulness/licensee/Poko.kt
@@ -0,0 +1,3 @@
+package io.github.usefulness.licensee
+
+internal annotation class Poko
diff --git a/licensee-for-android/gradle.properties b/licensee-for-android/gradle.properties
@@ -0,0 +1 @@
+kotlin.stdlib.default.dependency=false
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		package io.github.usefulness.licensee

		internal annotation class Poko