2
0

android_fixes.patch 2.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960
  1. From 27b2c3293ea6bde6e3d6168b11d41c337f1a0913 Mon Sep 17 00:00:00 2001
  2. From: Jorrit Rouwe <[email protected]>
  3. Date: Sat, 18 Feb 2023 10:41:45 +0100
  4. Subject: [PATCH] Upgrading android project (#437)
  5. ---
  6. Build/Android/UnitTests/build.gradle | 1 +
  7. Build/Android/UnitTests/src/main/AndroidManifest.xml | 3 +--
  8. Build/Android/build.gradle | 2 +-
  9. Build/Android/gradle/wrapper/gradle-wrapper.properties | 2 +-
  10. 4 files changed, 4 insertions(+), 4 deletions(-)
  11. diff --git a/Build/Android/UnitTests/build.gradle b/Build/Android/UnitTests/build.gradle
  12. index 1565ff485..d429825a6 100644
  13. --- a/Build/Android/UnitTests/build.gradle
  14. +++ b/Build/Android/UnitTests/build.gradle
  15. @@ -43,6 +43,7 @@ android {
  16. buildFeatures {
  17. viewBinding true
  18. }
  19. + namespace 'com.joltphysics.unittests'
  20. }
  21. dependencies {
  22. diff --git a/Build/Android/UnitTests/src/main/AndroidManifest.xml b/Build/Android/UnitTests/src/main/AndroidManifest.xml
  23. index f8662a355..e31e98364 100644
  24. --- a/Build/Android/UnitTests/src/main/AndroidManifest.xml
  25. +++ b/Build/Android/UnitTests/src/main/AndroidManifest.xml
  26. @@ -1,6 +1,5 @@
  27. <?xml version="1.0" encoding="utf-8"?>
  28. -<manifest xmlns:android="http://schemas.android.com/apk/res/android"
  29. - package="com.joltphysics.unittests">
  30. +<manifest xmlns:android="http://schemas.android.com/apk/res/android">
  31. <application
  32. android:allowBackup="true"
  33. diff --git a/Build/Android/build.gradle b/Build/Android/build.gradle
  34. index 7b2734da3..04bc67d84 100644
  35. --- a/Build/Android/build.gradle
  36. +++ b/Build/Android/build.gradle
  37. @@ -5,7 +5,7 @@ buildscript {
  38. mavenCentral()
  39. }
  40. dependencies {
  41. - classpath 'com.android.tools.build:gradle:7.2.2'
  42. + classpath 'com.android.tools.build:gradle:7.4.1'
  43. // NOTE: Do not place your application dependencies here; they belong
  44. // in the individual module build.gradle files
  45. diff --git a/Build/Android/gradle/wrapper/gradle-wrapper.properties b/Build/Android/gradle/wrapper/gradle-wrapper.properties
  46. index 8d8786327..7e62b17ac 100644
  47. --- a/Build/Android/gradle/wrapper/gradle-wrapper.properties
  48. +++ b/Build/Android/gradle/wrapper/gradle-wrapper.properties
  49. @@ -1,5 +1,5 @@
  50. distributionBase=GRADLE_USER_HOME
  51. -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
  52. +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
  53. distributionPath=wrapper/dists
  54. zipStorePath=wrapper/dists
  55. zipStoreBase=GRADLE_USER_HOME