Skip to content

Commit b6f758f

Browse files
committed
Merge pull request #521 from lewisl9029/bugfix-cordova-android-wrong-icon
Bugfix cordova android wrong icon.
2 parents 4053700 + b941ee3 commit b6f758f

File tree

7 files changed

+34
-33
lines changed

7 files changed

+34
-33
lines changed

README.md

Lines changed: 16 additions & 16 deletions
Large diffs are not rendered by default.

gulpfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ gulp.task('version', function version() {
9797
var tocVersion = require('./package.json').version;
9898
return gulp.src(basePaths.root + 'config.xml')
9999
.pipe(replace(
100-
/<widget id="net\.lewisl\.toc" version="[0-9]+(\.[0-9]+)*"/,
101-
'<widget id="net.lewisl.toc" version="' + tocVersion + '"'
100+
/<widget id="net\.lewisl\.toc-im" version="[0-9]+(\.[0-9]+)*"/,
101+
'<widget id="net.lewisl.toc-im" version="' + tocVersion + '"'
102102
))
103103
.pipe(gulp.dest(basePaths.root));
104104
});

resources/icon.png

-566 Bytes
Loading

scripts/toc-deploy-production.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@ npm version $TOC_VERSION || exit 0
1414
git push origin master
1515
git push origin refs/tags/$TOC_VERSION
1616

17-
# FIXME: disabling release builds due to ionic package issues
18-
# https://github.com/lewisl9029/toc/issues/505
19-
# gulp package --prod
20-
gulp package
17+
gulp package --prod
2118

2219
rm -rf ../toc-pages/app
2320
rm -rf ../toc-pages/index.html

scripts/toc-deploy-publish.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ rm -rf ../toc-pages/releases/$TOC_RELEASE
66
mkdir -p ../toc-pages/releases/$TOC_RELEASE
77
cp -r www/* ../toc-pages/releases/$TOC_RELEASE/
88

9-
tar -cvf $CIRCLE_ARTIFACTS/www.tar www
9+
tar -cvf "$CIRCLE_ARTIFACTS/Toc Messenger.tar" www
1010
cp "Toc Messenger.apk" $CIRCLE_ARTIFACTS/
1111
cp "Toc Messenger.ipa" $CIRCLE_ARTIFACTS/
1212

scripts/toc-package-android.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
set -e
33

44
TOC_PACKAGE_COMMAND="ionic package build android"
5-
if [ "$1" == "prod" ]
6-
then
7-
TOC_PACKAGE_COMMAND="ionic package build android \
8-
--release --profile toc_prod_profile"
9-
fi
5+
# FIXME: disabling release builds due to ionic package issues
6+
# https://github.com/lewisl9029/toc/issues/505
7+
# if [ "$1" == "prod" ]
8+
# then
9+
# TOC_PACKAGE_COMMAND="ionic package build android \
10+
# --release --profile toc_prod_profile"
11+
# fi
1012

1113
TOC_PACKAGE_ID="$($TOC_PACKAGE_COMMAND | \
1214
grep "Build ID: " | \

scripts/toc-package-ios.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
set -e
33

44
TOC_PACKAGE_COMMAND="ionic package build ios --profile toc_dev_profile"
5-
if [ "$1" == "prod" ]
6-
then
7-
TOC_PACKAGE_COMMAND="ionic package build ios \
8-
--release --profile toc_prod_profile"
9-
fi
5+
# FIXME: disabling release builds due to ionic package issues
6+
# https://github.com/lewisl9029/toc/issues/505
7+
# if [ "$1" == "prod" ]
8+
# then
9+
# TOC_PACKAGE_COMMAND="ionic package build ios \
10+
# --release --profile toc_prod_profile"
11+
# fi
1012

1113
TOC_PACKAGE_ID="$($TOC_PACKAGE_COMMAND | \
1214
grep "Build ID: " | \

0 commit comments

Comments
 (0)