Reuse library version definition from pillarbox-analytics

SRGSSR · Jun 20, 2024 · 84bf863 · 84bf863
1 parent 03ee04a
commit 84bf863
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 45 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,8 +21,6 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
@@ -45,8 +43,6 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
@@ -74,8 +70,6 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
@@ -103,8 +97,6 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
@@ -132,8 +124,6 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
@@ -183,8 +173,6 @@ jobs:
           sudo udevadm control --reload-rules
           sudo udevadm trigger --name-match=kvm
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:

diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
@@ -19,8 +19,6 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:

diff --git a/.github/workflows/dependency_graph.yml b/.github/workflows/dependency_graph.yml
@@ -20,8 +20,6 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -21,8 +21,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
       - id: should_run
         name: Check that the last commit was made in the last 24h
         if: ${{ github.event_name == 'schedule' }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,8 +16,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
       - name: Check if pre release tag
         id: check-tag
         run: |

diff --git a/pillarbox-player/build.gradle.kts b/pillarbox-player/build.gradle.kts
@@ -3,8 +3,6 @@
  * License information is available from the LICENSE file.
  */
 
-import java.io.ByteArrayOutputStream
-
 plugins {
     alias(libs.plugins.pillarbox.android.library)
     alias(libs.plugins.pillarbox.android.library.publishing)
@@ -13,21 +11,12 @@ plugins {
 }
 
 android {
-    buildFeatures {
-        buildConfig = true
+    defaultConfig {
+        buildConfigField("String", "VERSION_NAME", "\"${version}\"")
     }
 
-    buildTypes {
-        debug {
-            buildConfigField("String", "VERSION_NAME", "\"debug\"")
-        }
-
-        release {
-            val latestTagHash = execCommand("git", "rev-list", "--tags", "--max-count=1")
-            val versionName = execCommand("git", "describe", "--tags", "$latestTagHash")
-
-            buildConfigField("String", "VERSION_NAME", "\"${versionName}\"")
-        }
+    buildFeatures {
+        buildConfig = true
     }
 
     // Mockk includes some licenses information, which may conflict with other license files. This block merges all licenses together.
@@ -80,13 +69,3 @@ dependencies {
     androidTestRuntimeOnly(libs.kotlinx.coroutines.android)
     androidTestImplementation(libs.mockk)
 }
-
-private fun execCommand(vararg commandSegments: String): String {
-    return ByteArrayOutputStream().use { stream ->
-        exec {
-            commandLine = commandSegments.toList()
-            standardOutput = stream
-        }
-        stream.toString(Charsets.UTF_8).trim()
-    }
-}