fix: build workflow

Zaxx69 · Jun 11, 2023 · 8d7da07 · 8d7da07
1 parent 1eae4b9
commit 8d7da07
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -40,7 +40,7 @@ jobs:
 
       - name : Retrieve Version
         run: |
-          echo "::set-output name=VERSION_NAME::$(${{github.workspace}}/gradlew -q printVersionName)"
+          echo "name=VERSION_NAME=$(${{github.workspace}}/gradlew -q printVersionName)"
         id: android_version
 
       - name: Get version

diff --git a/app/build.gradle b/app/build.gradle
@@ -69,7 +69,9 @@ android {
 }
 
 tasks.register("printVersionName") {
-    println project.ext.version_name
+    doLast {
+            println("${android.defaultConfig.versionName}")
+        }
 }
 
 dependencies {

diff --git a/app/src/main/java/com/chouten/app/ui/views/info/InfoPage.kt b/app/src/main/java/com/chouten/app/ui/views/info/InfoPage.kt
@@ -108,7 +108,7 @@ fun InfoPage(
     val leftOffset =
         -(LocalConfiguration.current.screenWidthDp * 2) + (scrollState.value * 1.1).toInt()
     val offsetX by animateIntOffsetAsState(
-        targetValue = if (scrollState.value >= 700) IntOffset(
+        targetValue = if (leftOffset >= 0) IntOffset(
             scrollState.value * 2,
             0
         ) else IntOffset.Zero,

diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,9 @@ buildscript {
         mavenCentral()
         maven { url 'https://jitpack.io' }
     }
+
 }// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
 plugins {
     id 'com.android.application' version '8.0.2' apply false
     id 'com.android.library' version '8.0.2' apply false