Merge branch 'main' into deps/modules/sentry-cli.properties/2.42.2

Author: bitsandfoxes

CHANGELOG.md

@@ -2,8 +2,15 @@
 
 ## Unreleased
 
+### Fixes
+
+- The SDK now ensures that the correct version of the Android SDK gets used during the build. This prevents dependency conflicts and no longer requires "clean" builds to resolve ([#2031](https://github.com/getsentry/sentry-unity/pull/2031))
+
 ### Dependencies
 
+- Bump Native SDK from v0.7.20 to v0.8.0 ([#2034](https://github.com/getsentry/sentry-unity/pull/2034))
+  - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#080)
+  - [diff](https://github.com/getsentry/sentry-native/compare/0.7.20...0.8.0)
 - Bump CLI from v2.42.1 to v2.42.2 ([#2033](https://github.com/getsentry/sentry-unity/pull/2033))
   - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2422)
   - [diff](https://github.com/getsentry/sentry-cli/compare/2.42.1...2.42.2)

modules/sentry-native

@@ -228,14 +228,16 @@ internal void CopyAndroidSdkToGradleProject(string unityProjectPath, string grad
                 throw new DirectoryNotFoundException($"Failed to find the Android SDK at '{androidSdkPath}'.");
             }
 
+            Directory.CreateDirectory(targetPath);
+
             _logger.LogInfo("Copying the Android SDK to '{0}'.", gradlePath);
-            foreach (var file in Directory.GetFiles(androidSdkPath))
+            foreach (var sourceFileName in Directory.GetFiles(androidSdkPath))
             {
-                var destinationFile = Path.Combine(targetPath, Path.GetFileName(file));
-                if (!File.Exists(destinationFile))
-                {
-                    File.Copy(file, destinationFile);
-                }
+                var fileName = Path.GetFileName(sourceFileName);
+                var destFileName = Path.Combine(targetPath, fileName);
+                _logger.LogDebug("Copying '{0}' to '{1}'", fileName, destFileName);
+
+                File.Copy(sourceFileName, destFileName, overwrite: true);
             }
         }
         else

src/Sentry.Unity.Editor/Android/AndroidManifestConfiguration.cs

@@ -421,6 +421,28 @@ public void CopyAndroidSdkToGradleProject_AndroidNativeSupportDisabledButSdkAlre
         Directory.Delete(fakeProjectPath, true);
     }
 
+    [Test]
+    public void CopyAndroidSdkToGradleProject_SdkAlreadyExists_OverwritesExistingSdk()
+    {
+        var fakeProjectPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
+        var unityProjectPath = Path.Combine(fakeProjectPath, "UnityProject");
+        var gradleProjectPath = Path.Combine(fakeProjectPath, "GradleProject");
+        DebugSymbolUploadTests.SetupFakeProject(fakeProjectPath);
+
+        var targetPath = Path.Combine(gradleProjectPath, "unityLibrary", "libs");
+        Directory.CreateDirectory(targetPath);
+        var existingFile = Path.Combine(targetPath, "androidSdk.jar");
+        File.WriteAllText(existingFile, "original content");
+
+        var sut = _fixture.GetSut();
+        sut.CopyAndroidSdkToGradleProject(unityProjectPath, gradleProjectPath);
+
+        var newContent = File.ReadAllBytes(existingFile);
+        Assert.AreNotEqual("original content", System.Text.Encoding.UTF8.GetString(newContent));
+
+        Directory.Delete(fakeProjectPath, true);
+    }
+
     private string WithAndroidManifest(Action<string> callback)
     {
         var basePath = GetFakeManifestFileBasePath();