Skip to content

Commit 8782660

Browse files
committed
Omit generated Packages/manifest.json from build
* manifest.json with old versions can cause the build script to crash - Script move moves it out before building so Unity will generate a safe default. * Also removed manifest.json from repo, we want a new default clean one every time.
1 parent 1a9b94d commit 8782660

File tree

3 files changed

+28
-28
lines changed

3 files changed

+28
-28
lines changed

.gitignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,9 @@ OneSignalExample/Assets/Plugins/**/*.aar
22
OneSignalExample/Assets/Plugins/**/*.aar.meta
33
OneSignalExample/Assets/Plugins/**/*.jar
44
OneSignalExample/Assets/Plugins/**/*.jar.meta
5-
build.log
5+
build.log
6+
7+
# Normaly you do commit this file however since we
8+
# always switch Unity versions and want to use
9+
# the default packages and versions
10+
OneSignalExample/Packages/manifest.json

OneSignalExample/Packages/manifest.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

buildpackage.sh

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,40 +18,46 @@ icons_location=$project_path/Assets/AppIcons
1818
icons_temp_location=$(pwd)/onesignal_temp/tempAppIcons
1919
android_location=$project_path/Assets/Plugins/Android
2020
config_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
3536
mv $icons_location $icons_temp_location
3637
mv $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
3943
mv $config_location $temp_location/OneSignalConfig
4044
mv $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
4347
rm -r $android_location
4448
mkdir $android_location
4549

46-
#put the config files back
50+
# put the config files back
4751
mv $temp_location/OneSignalConfig $config_location
4852
mv $temp_location/OneSignalConfig.meta $config_location.meta
4953

54+
## END - Clean Android files
55+
5056
# Create the .unitypackage
5157
echo "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 \
@@ -72,6 +78,9 @@ fi
7278
#move it to the root of the repo
7379
mv $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
7685
mv $icons_temp_location $icons_location
7786
mv $icons_temp_location.meta $icons_location.meta

0 commit comments

Comments
 (0)