@@ -18,40 +18,46 @@ icons_location=$project_path/Assets/AppIcons
1818icons_temp_location=$( pwd) /onesignal_temp/tempAppIcons
1919android_location=$project_path /Assets/Plugins/Android
2020config_location=$android_location /OneSignalConfig
21+ package_manifest=$project_path /Packages/manifest.json
22+ temp_package_manifest=$temp_location /Packages/manifest.json
2123
22- if [ ! -d $temp_location ]; then
23- mkdir $temp_location
24- fi
24+ mkdir -p $temp_location
2525
2626# Removed generated Android manifest files
27- if [[ -e " $config_location /AndroidManifest.xml" ]]; then
28- rm $config_location /AndroidManifest.xml
29- fi
30- if [[ -e " $config_location /AndroidManifest.xml.meta" ]]; then
31- rm $config_location /AndroidManifest.xml.meta
32- fi
27+ rm $config_location /AndroidManifest.xml 2> /dev/null
28+ rm $config_location /AndroidManifest.xml.meta 2> /dev/null
29+
30+ # temp move out Packages/manifest.json
31+ # This prevents possible crashes due to old versions in this manifest
32+ mkdir -p $temp_location /Packages/
33+ mv $package_manifest $temp_package_manifest
3334
3435# temporarily remove Android AppIcons
3536mv $icons_location $icons_temp_location
3637mv $icons_location .meta $icons_temp_location .meta
3738
38- # temporarily move some necessary files
39+ # # START - Clean Android files
40+ # This removes any .aar files we don't want to bundle in our package
41+
42+ # temporarily move some necessary files
3943mv $config_location $temp_location /OneSignalConfig
4044mv $config_location .meta $temp_location /OneSignalConfig.meta
4145
42- # get rid of a bunch of unnecessary files
46+ # get rid of a bunch of unnecessary files
4347rm -r $android_location
4448mkdir $android_location
4549
46- # put the config files back
50+ # put the config files back
4751mv $temp_location /OneSignalConfig $config_location
4852mv $temp_location /OneSignalConfig.meta $config_location .meta
4953
54+ # # END - Clean Android files
55+
5056# Create the .unitypackage
5157echo " Creating unitypackage."
5258# Setting standalone keeps AndroidManifest.xml from being regenerated
5359# buildTarget must be before exportPackage for this to work
54- /Applications/Unity/Hub/Editor/2019.1.12f1 /Unity.app/Contents/MacOS/Unity \
60+ /Applications/Unity/Hub/Editor/2019.2.14f1 /Unity.app/Contents/MacOS/Unity \
5561 -batchMode \
5662 -buildTarget standalone \
5763 -projectPath $project_path \
7278# move it to the root of the repo
7379mv $generated_path $final_path
7480
81+ # move back Packages/manifest.json
82+ mv $temp_package_manifest $package_manifest
83+
7584# move the icons back to their original location
7685mv $icons_temp_location $icons_location
7786mv $icons_temp_location .meta $icons_location .meta
0 commit comments