Merge pull request #56 from psuzn/main

develop -> main
psuzn · Dec 21, 2023 · f9f628c · f9f628c
2 parents 15dee4f + a548161
commit f9f628c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
@@ -128,14 +128,14 @@ jobs:
           TMP_BUNDLE=$(ls androidApp/build/outputs/bundle/release/*.aab)
           RELEASE_BUNDLE="${TMP_BUNDLE/-release/""}"
           mv $TMP_BUNDLE $RELEASE_BUNDLE
-          mv $RELEASE_BUNDLE $TMP_BUNDLE
+          mv $RELEASE_BUNDLE $ARTIFACTS
 
           echo "artifacts=$ARTIFACTS" >> $GITHUB_OUTPUT
 
       - uses: actions/upload-artifact@v3
         with:
           name: android-bundles
-          path: ${{ steps.collect_artifacts.artifacts }}
+          path: ${{ steps.collect_artifacts.outputs.artifacts }}
 
   desktop_release:
     name: Build desktop apps

diff --git a/CHANGELOG/CHANGELOG.md b/CHANGELOG/CHANGELOG.md
@@ -1,5 +1,3 @@
 # Feature
-- Support for push notification [android]
-
-# Fix
-- Database migration issue on desktop
+- F-droid release
+  - Attempt fix for reproducible build
diff --git a/buildSrc/src/main/kotlin/Artifacts.kt b/buildSrc/src/main/kotlin/Artifacts.kt
@@ -1,9 +1,9 @@
 object Artifact {
   const val APP_ID = "me.sujanpoudel.playdeals"
   const val APP_NAME = "App Deals"
-  const val VERSION_CODE = 25
-  const val VERSION_NAME = "2.1.0"
-  const val MAJOR_RELEASE = true
+  const val VERSION_CODE = 30
+  const val VERSION_NAME = "2.1.5"
+  const val MAJOR_RELEASE = false
 
   const val ANDROID_COMPILE_SDK = 34
   const val ANDROID_TARGET_SDK = 34

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -2,6 +2,7 @@ object Versions {
   const val KOTLIN = "1.9.20"
   const val AGP = "8.2.0"
   const val COMPOSE = "1.5.11"
+  const val COMPOSE_COMPILER_VERSION = "1.5.6"
   const val SETTINGS = "1.0.0"
   const val SQLDELIGHT = "2.0.0"
   const val FIREBASE_BOM = "32.3.1"

diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -132,7 +132,7 @@ android {
   }
 
   composeOptions {
-    kotlinCompilerExtensionVersion = "1.5.3"
+    kotlinCompilerExtensionVersion = Versions.COMPOSE_COMPILER_VERSION
   }
 
   compileOptions {