Fix build scan

gchristov · Mar 21, 2024 · 0cf707a · 0cf707a
1 parent 6ffccef
commit 0cf707a
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -45,7 +45,7 @@ jobs:
       - name: Unit test
         run: |
           set -o pipefail && 
-          ./gradlew --no-daemon --continue testDebugUnitTest --scan
+          ./gradlew --no-daemon --continue testDebugUnitTest
       - name: Generate test report
         uses: mikepenz/action-junit-report@v4
         if: always() # Ensure all test reports are collected, even after errors
@@ -176,7 +176,7 @@ jobs:
       - name: Compile Android app
         run: |
           set -o pipefail && 
-          ./gradlew android:app:assembleDebug --scan
+          ./gradlew android:app:assembleDebug
       - name: Artifacts
         uses: actions/upload-artifact@v4
         if: always() # Ensure all artifacts are collected, even after errors
@@ -237,7 +237,7 @@ jobs:
           force-avd-creation: false
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
-          script: set -o pipefail && ./gradlew connectedAndroidTest --scan
+          script: set -o pipefail && ./gradlew connectedAndroidTest
       - name: Artifacts
         uses: actions/upload-artifact@v4
         if: always() # Ensure all artifacts are collected, even after errors

diff --git a/appIos/appIos.xcodeproj/project.pbxproj b/appIos/appIos.xcodeproj/project.pbxproj
@@ -183,7 +183,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Compile shared KMM code from the main app to so that its signature is valid\necho \"Signing shared KMM module with $TARGET_NAME's signature\"\ncd \"$SRCROOT/..\"\n./gradlew :multiplatform:umbrella:embedAndSignAppleFrameworkForXcode --scan\n";
+			shellScript = "# Compile shared KMM code from the main app to so that its signature is valid\necho \"Signing shared KMM module with $TARGET_NAME's signature\"\ncd \"$SRCROOT/..\"\n./gradlew :multiplatform:umbrella:embedAndSignAppleFrameworkForXcode\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

diff --git a/appIos/feed/feed.xcodeproj/project.pbxproj b/appIos/feed/feed.xcodeproj/project.pbxproj
@@ -317,7 +317,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Shared KMM compilation needed here in addition to the main app because Xcode compiles \n# projects based on dependencies so this module might be compiled before anything else, \n# in which case we might get Xcode errors about missing KMM modules\necho \"Building shared KMM module for target $TARGET_NAME\"\ncd \"$SRCROOT/../..\"\n./gradlew :multiplatform:umbrella:embedAndSignAppleFrameworkForXcode --scan\n";
+			shellScript = "# Shared KMM compilation needed here in addition to the main app because Xcode compiles \n# projects based on dependencies so this module might be compiled before anything else, \n# in which case we might get Xcode errors about missing KMM modules\necho \"Building shared KMM module for target $TARGET_NAME\"\ncd \"$SRCROOT/../..\"\n./gradlew :multiplatform:umbrella:embedAndSignAppleFrameworkForXcode\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

diff --git a/appIos/post/post.xcodeproj/project.pbxproj b/appIos/post/post.xcodeproj/project.pbxproj
@@ -311,7 +311,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Shared KMM compilation needed here in addition to the main app because Xcode compiles \n# projects based on dependencies so this module might be compiled before anything else, \n# in which case we might get Xcode errors about missing KMM modules\necho \"Building shared KMM module for target $TARGET_NAME\"\ncd \"$SRCROOT/../..\"\n./gradlew :multiplatform:umbrella:embedAndSignAppleFrameworkForXcode --scan\n";
+			shellScript = "# Shared KMM compilation needed here in addition to the main app because Xcode compiles \n# projects based on dependencies so this module might be compiled before anything else, \n# in which case we might get Xcode errors about missing KMM modules\necho \"Building shared KMM module for target $TARGET_NAME\"\ncd \"$SRCROOT/../..\"\n./gradlew :multiplatform:umbrella:embedAndSignAppleFrameworkForXcode\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -9,6 +9,10 @@ pluginManagement {
     }
 }
 
+plugins {
+    id("com.gradle.enterprise") version("3.16.2")
+}
+
 dependencyResolutionManagement {
     repositories {
         google()
@@ -17,6 +21,14 @@ dependencyResolutionManagement {
     }
 }
 
+gradleEnterprise {
+    buildScan {
+        termsOfServiceUrl = "https://gradle.com/terms-of-service"
+        termsOfServiceAgree = "yes"
+        publishAlways()
+    }
+}
+
 rootProject.name = "newsfeed-kotlin-multiplatform"
 
 // Multiplatform