Fix failing build

usefulness · May 19, 2024 · 0c9c095 · 0c9c095
1 parent c74b52b
commit 0c9c095
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 7 deletions.
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -55,6 +55,37 @@ jobs:
           name: test-results-${{ matrix.os }}
           path: "${{ github.workspace }}/**/build/reports/tests"
 
+  build-sample:
+    runs-on: ubuntu-latest
+    name: Build sample app
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Write Gradle build properties to `~/.gradle/gradle.properties`
+        run: |
+          mkdir -p ~/.gradle
+          printf "org.gradle.jvmargs=-Xmx3G -XX:+UseParallelGC\n" >> ~/.gradle/gradle.properties
+          printf "org.gradle.vfs.watch=false\n" >> ~/.gradle/gradle.properties
+        shell: bash
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 21
+
+      - uses: gradle/actions/setup-gradle@v3
+
+      - run: ./gradlew check
+        working-directory: sample
+
+      - uses: actions/upload-artifact@v4
+        if: ${{ always() }}
+        with:
+          name: sample-test-results-${{ matrix.os }}
+          path: "${{ github.workspace }}/**/build/reports/tests"
+
   provide-agp-version-matrix:
     runs-on: ubuntu-latest
     outputs:
@@ -98,9 +129,10 @@ jobs:
 
       - uses: gradle/actions/setup-gradle@v3
         with:
-          build-root-directory: sample
           gradle-version: ${{ matrix.gradle }}
-          arguments: build -PagpVersion=${{ matrix.agp }} --continue
+
+      - run: ./gradlew build -PagpVersion=${{ matrix.agp }} --continue
+        working-directory: sample
 
       - name: Upload reports
         if: ${{ failure() }}

diff --git a/sample/app/src/test/kotlin/io/github/usefulness/licensee/TestUtils.kt b/sample/app/src/test/kotlin/io/github/usefulness/licensee/TestUtils.kt
@@ -15,16 +15,16 @@ internal fun <T> checkLoadedArtifacts(artifacts: List<T>, isViewPager2Dependency
             Artifact(
                 groupId = "androidx.viewpager2",
                 artifactId = "viewpager2",
-                version = "1.0.0",
-                name = "AndroidX Widget ViewPager2",
+                version = "1.1.0",
+                name = "ViewPager2",
                 spdxLicenses = listOf(
                     SpdxLicense(
                         identifier = "Apache-2.0",
                         name = "Apache License 2.0",
                         url = "https://www.apache.org/licenses/LICENSE-2.0",
                     ),
                 ),
-                scm = Scm(url = "http://source.android.com"),
+                scm = Scm(url = "https://cs.android.com/androidx/platform/frameworks/support"),
                 unknownLicenses = emptyList(),
             ).toString(),
         )

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -7,7 +7,7 @@ plugins {
 }
 
 commonConfig {
-    javaVersion = JavaVersion.VERSION_1_8
+    javaVersion = JavaVersion.VERSION_11
 }
 
 subprojects {
@@ -19,5 +19,4 @@ subprojects {
             jvmTarget = "20"
         }
     }
-
 }