From a9332fd9290c09cf6b9210af3b299e40afff3640 Mon Sep 17 00:00:00 2001
From: Zara Karlsson <zara.karlsson628@gmail.com>
Date: Wed, 13 Oct 2021 23:17:32 -0400
Subject: [PATCH] Make sure to only commit once:
 https://github.com/Triple-T/gradle-play-publisher/issues/217 (#1781)

---
 .github/workflows/weekly.yaml | 2 +-
 app/build.gradle.kts          | 2 ++
 wear/build.gradle.kts         | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/weekly.yaml b/.github/workflows/weekly.yaml
index 0d8a7e2c..09eb71d6 100644
--- a/.github/workflows/weekly.yaml
+++ b/.github/workflows/weekly.yaml
@@ -58,7 +58,7 @@ jobs:
           KEYSTORE_ALIAS_PASSWORD: ${{ secrets.UPLOAD_KEYSTORE_ALIAS_PASSWORD }}
           VERSION: ${{ steps.rel_number.outputs.version }}
           VERSION_CODE: ${{ steps.rel_number.outputs.version-code }}
-        run: ./gradlew bundleFullRelease
+        run: ./gradlew :app:bundleFullRelease :wear:bundleRelease
 
       - name: Check for build need
         run: |
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index a36f2438..98bb7149 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -114,6 +114,8 @@ play {
     serviceAccountCredentials.set(file("playStorePublishServiceCredentialsFile.json"))
     track.set("beta")
     resolutionStrategy.set(ResolutionStrategy.IGNORE)
+    // We will depend on the wear commit.
+    commit.set(false)
 }
 
 dependencies {
diff --git a/wear/build.gradle.kts b/wear/build.gradle.kts
index c18cf5f4..27015f57 100644
--- a/wear/build.gradle.kts
+++ b/wear/build.gradle.kts
@@ -68,6 +68,7 @@ play {
     serviceAccountCredentials.set(file("playStorePublishServiceCredentialsFile.json"))
     track.set("beta")
     resolutionStrategy.set(com.github.triplet.gradle.androidpublisher.ResolutionStrategy.IGNORE)
+    commit.set(true)
 }
 
 dependencies {