Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix] OneSignalConfig.androidlib version numbers in build.gradle #673

Merged
merged 4 commits into from
Dec 12, 2023
Merged

[Fix] OneSignalConfig.androidlib version numbers in build.gradle #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3ec56ad
Set versions to match Unity
shepherd-l Dec 12, 2023
4e1e957
Update example androidlib
shepherd-l Dec 12, 2023
36c6746
Update CHANGELOG
shepherd-l Dec 12, 2023
ce4f325
Fix spacing
shepherd-l Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions OneSignalExample/Assets/OneSignal/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
9 changes: 7 additions & 2 deletions OneSignalExample/Assets/Plugins/Android/OneSignalConfig.androidlib/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,16 @@ android {
}
}

def unityLib = project(':unityLibrary').extensions.getByName('android')

defaultConfig {
consumerProguardFiles "consumer-proguard.pro"
consumerProguardFiles "consumer-proguard.pro"
minSdkVersion unityLib.defaultConfig.minSdk
shepherd-l marked this conversation as resolved.
Show resolved Hide resolved
targetSdkVersion unityLib.defaultConfig.targetSdk
}

compileSdkVersion 31
compileSdkVersion unityLib.compileSdkVersion
buildToolsVersion unityLib.buildToolsVersion

lintOptions {
abortOnError false
Expand Down
9 changes: 7 additions & 2 deletions com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,16 @@ android {
}
}

def unityLib = project(':unityLibrary').extensions.getByName('android')

defaultConfig {
consumerProguardFiles "consumer-proguard.pro"
consumerProguardFiles "consumer-proguard.pro"
minSdkVersion unityLib.defaultConfig.minSdk
shepherd-l marked this conversation as resolved.
Show resolved Hide resolved
targetSdkVersion unityLib.defaultConfig.targetSdk
}

compileSdkVersion 31
compileSdkVersion unityLib.compileSdkVersion
buildToolsVersion unityLib.buildToolsVersion

lintOptions {
abortOnError false
Expand Down
Loading