From c2b2eac508bb32d71cecd0610dc05a04fcfa27c1 Mon Sep 17 00:00:00 2001 From: Shepherd Date: Tue, 12 Dec 2023 13:50:28 -0500 Subject: [PATCH 1/4] Set versions to match Unity Not specifying a version number sets it to a low version instead. minSDKVersion was set to 1 and added the READ_PHONE_STATE permission. Lower build-tools versions than the one the Unity Editor comes with were being required when building for Android. compileSDKVersion is required to be defined inorder to build and has been changed to match the version specified in Unity --- .../Editor/OneSignalConfig.androidlib/build.gradle | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/build.gradle b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/build.gradle index bae867d70..50b53c535 100644 --- a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/build.gradle +++ b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/build.gradle @@ -7,11 +7,16 @@ android { } } + def unityLib = project(':unityLibrary').extensions.getByName('android') + defaultConfig { consumerProguardFiles "consumer-proguard.pro" + minSdkVersion unityLib.defaultConfig.minSdk + targetSdkVersion unityLib.defaultConfig.targetSdk } - compileSdkVersion 31 + compileSdkVersion unityLib.compileSdkVersion + buildToolsVersion unityLib.buildToolsVersion lintOptions { abortOnError false From 50fadf4c4c5554cec947bebe6b3722bb57519e1e Mon Sep 17 00:00:00 2001 From: Shepherd Date: Tue, 12 Dec 2023 14:24:50 -0500 Subject: [PATCH 2/4] Update example androidlib Deleted OneSignalConfig.androidlib from example project and ran Window > OneSignal SDK Setup > Copy Android plugin to Assets --- .../Android/OneSignalConfig.androidlib/build.gradle | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/OneSignalExample/Assets/Plugins/Android/OneSignalConfig.androidlib/build.gradle b/OneSignalExample/Assets/Plugins/Android/OneSignalConfig.androidlib/build.gradle index bae867d70..50b53c535 100644 --- a/OneSignalExample/Assets/Plugins/Android/OneSignalConfig.androidlib/build.gradle +++ b/OneSignalExample/Assets/Plugins/Android/OneSignalConfig.androidlib/build.gradle @@ -7,11 +7,16 @@ android { } } + def unityLib = project(':unityLibrary').extensions.getByName('android') + defaultConfig { consumerProguardFiles "consumer-proguard.pro" + minSdkVersion unityLib.defaultConfig.minSdk + targetSdkVersion unityLib.defaultConfig.targetSdk } - compileSdkVersion 31 + compileSdkVersion unityLib.compileSdkVersion + buildToolsVersion unityLib.buildToolsVersion lintOptions { abortOnError false From 5f1230c0c2f8a835ec65ac866d2c2fa881eb01c8 Mon Sep 17 00:00:00 2001 From: Shepherd Date: Tue, 12 Dec 2023 14:38:14 -0500 Subject: [PATCH 3/4] Update CHANGELOG --- OneSignalExample/Assets/OneSignal/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OneSignalExample/Assets/OneSignal/CHANGELOG.md b/OneSignalExample/Assets/OneSignal/CHANGELOG.md index 3daefdbad..dffc1e56c 100644 --- a/OneSignalExample/Assets/OneSignal/CHANGELOG.md +++ b/OneSignalExample/Assets/OneSignal/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Fixed - Duplicate symbol errors when building with other iOS plugins +- Removed READ_PHONE_STATE permission in Android builds. Delete your OneSignalConfig.androidlib and run the +"Copy Android plugin to Assets" step in **Window > OneSignal SDK Setup** to apply the fix. +- Fixed lower build-tools versions being needed for Android builds. Delete your OneSignalConfig.androidlib and run the +"Copy Android plugin to Assets" step in **Window > OneSignal SDK Setup** to apply the fix. ### Changed - Updated included Android SDK to [5.0.4](https://github.com/OneSignal/OneSignal-Android-SDK/releases/tag/5.0.4) - Updated included iOS SDK to [5.0.4](https://github.com/OneSignal/OneSignal-iOS-SDK/releases/tag/5.0.4) From 08f33a5af82742ce67d6d06207cc79307066284d Mon Sep 17 00:00:00 2001 From: Shepherd Date: Tue, 12 Dec 2023 15:26:32 -0500 Subject: [PATCH 4/4] Fix spacing --- .../Plugins/Android/OneSignalConfig.androidlib/build.gradle | 2 +- .../Editor/OneSignalConfig.androidlib/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OneSignalExample/Assets/Plugins/Android/OneSignalConfig.androidlib/build.gradle b/OneSignalExample/Assets/Plugins/Android/OneSignalConfig.androidlib/build.gradle index 50b53c535..056c1f0c1 100644 --- a/OneSignalExample/Assets/Plugins/Android/OneSignalConfig.androidlib/build.gradle +++ b/OneSignalExample/Assets/Plugins/Android/OneSignalConfig.androidlib/build.gradle @@ -10,7 +10,7 @@ android { def unityLib = project(':unityLibrary').extensions.getByName('android') defaultConfig { - consumerProguardFiles "consumer-proguard.pro" + consumerProguardFiles "consumer-proguard.pro" minSdkVersion unityLib.defaultConfig.minSdk targetSdkVersion unityLib.defaultConfig.targetSdk } diff --git a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/build.gradle b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/build.gradle index 50b53c535..056c1f0c1 100644 --- a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/build.gradle +++ b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/build.gradle @@ -10,7 +10,7 @@ android { def unityLib = project(':unityLibrary').extensions.getByName('android') defaultConfig { - consumerProguardFiles "consumer-proguard.pro" + consumerProguardFiles "consumer-proguard.pro" minSdkVersion unityLib.defaultConfig.minSdk targetSdkVersion unityLib.defaultConfig.targetSdk }