Skip to content

Commit

Permalink
Merge pull request #140 from shoutem/release/5.3.0
Browse files Browse the repository at this point in the history
Release/5.3.0
  • Loading branch information
Definitely-Not-Vlad authored Mar 24, 2022
2 parents 26260a4 + 6bbcf2a commit da4b811
Show file tree
Hide file tree
Showing 14 changed files with 2,786 additions and 3,034 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ ios/Pods
ios/Podfile.lock
config/
dependencies.json
nativeDependencies.json
**/package-lock.json
!extensions/**/app/ios
/firebase.json
Expand Down
3 changes: 1 addition & 2 deletions android/app/app.iml
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@
<orderEntry type="module" module-name="react-native-video" exported="" />
<orderEntry type="module" module-name="react-native-maps" exported="" />
<orderEntry type="module" module-name="react-native-restart" exported="" />
<orderEntry type="module" module-name="react-native-vector-icons" exported="" />
<orderEntry type="module" module-name="react-native-google-analytics-bridge" exported="" />
<orderEntry type="module" module-name="react-native-code-push" exported="" />
<orderEntry type="library" exported="" name="okhttp-ws-2.5.0" level="project" />
Expand All @@ -209,4 +208,4 @@
<orderEntry type="library" exported="" name="support-annotations-23.2.1" level="project" />
<orderEntry type="library" exported="" name="react-native-0.19.1" level="project" />
</component>
</module>
</module>
22 changes: 1 addition & 21 deletions ios/ShoutemApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,10 @@
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = ShoutemApp/Images.xcassets; sourceTree = "<group>"; };
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = ShoutemApp/Info.plist; sourceTree = "<group>"; };
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = ShoutemApp/main.m; sourceTree = "<group>"; };
1CA555BF07B34B10AEBC86B0 /* Zocial.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Zocial.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = "<group>"; };
1F6C9D902A9741FD8E0F16D0 /* Rubik-Light.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Rubik-Light.ttf"; path = "../node_modules/@shoutem/ui/fonts/Rubik-Light.ttf"; sourceTree = "<group>"; };
2787A9A91DFB06A400CED4F3 /* LaunchScreen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LaunchScreen.xib; sourceTree = "<group>"; };
28D8B4CDF73A43A29C57263B /* Foundation.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Foundation.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = "<group>"; };
2BFD8204FA6A400C87751025 /* Octicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Octicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = "<group>"; };
3A8D4677A6794866B6FE678E /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialCommunityIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf"; sourceTree = "<group>"; };
40D0AF613C1A4641A0FC53FD /* Ionicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Ionicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = "<group>"; };
42D23E13D1C24BFB96C8CE3B /* Rubik-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Rubik-Regular.ttf"; path = "../node_modules/@shoutem/ui/fonts/Rubik-Regular.ttf"; sourceTree = "<group>"; };
465FAB230718430789478FBB /* FontAwesome.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = "<group>"; };
49057C3259AC4BF595C560C0 /* Rubik-Italic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Rubik-Italic.ttf"; path = "../node_modules/@shoutem/ui/fonts/Rubik-Italic.ttf"; sourceTree = "<group>"; };
7412AE3E73704AF899BB23F1 /* MaterialIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = "<group>"; };
7EFC29E2138D48C0B5742BA8 /* Entypo.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Entypo.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = "<group>"; };
940F73BC97204D1D93212595 /* Rubik-Bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Rubik-Bold.ttf"; path = "../node_modules/@shoutem/ui/fonts/Rubik-Bold.ttf"; sourceTree = "<group>"; };
9B651712A16237221D96DF0B /* Pods_ShoutemApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ShoutemApp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
A2E4D4E194DC4F61B2E45B32 /* OFL.txt */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = OFL.txt; path = "../node_modules/@shoutem/ui/fonts/OFL.txt"; sourceTree = "<group>"; };
Expand All @@ -56,13 +48,11 @@
CC8D10AC14D847C3B13C7643 /* Rubik-Medium.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Rubik-Medium.ttf"; path = "../node_modules/@shoutem/ui/fonts/Rubik-Medium.ttf"; sourceTree = "<group>"; };
DA66C115B7FDDE18A3D043F9 /* Pods-ShoutemApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShoutemApp.release.xcconfig"; path = "Pods/Target Support Files/Pods-ShoutemApp/Pods-ShoutemApp.release.xcconfig"; sourceTree = "<group>"; };
DB55DCC1A4564399A404FE53 /* Rubik-LightItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Rubik-LightItalic.ttf"; path = "../node_modules/@shoutem/ui/fonts/Rubik-LightItalic.ttf"; sourceTree = "<group>"; };
EF5662F18A9E493DAC7131CB /* EvilIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = EvilIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = "<group>"; };
F318717567ED439CAA7CDD63 /* rubicon-icon-font.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "rubicon-icon-font.ttf"; path = "../node_modules/@shoutem/ui/fonts/rubicon-icon-font.ttf"; sourceTree = "<group>"; };
F441C48F1CB04CAD84D5D2EE /* Rubik-BlackItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Rubik-BlackItalic.ttf"; path = "../node_modules/@shoutem/ui/fonts/Rubik-BlackItalic.ttf"; sourceTree = "<group>"; };
F4EA896D67D145EA9C36070C /* Pods-ShoutemApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ShoutemApp.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ShoutemApp/Pods-ShoutemApp.debug.xcconfig"; sourceTree = "<group>"; };
F5072C9A239A525500D0A173 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; };
F5072C9B239A527200D0A173 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
F66044FAC633487E920F2E92 /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = SimpleLineIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -153,18 +143,8 @@
CC8D10AC14D847C3B13C7643 /* Rubik-Medium.ttf */,
0419683CEA504DD8BA684999 /* Rubik-MediumItalic.ttf */,
42D23E13D1C24BFB96C8CE3B /* Rubik-Regular.ttf */,
7EFC29E2138D48C0B5742BA8 /* Entypo.ttf */,
EF5662F18A9E493DAC7131CB /* EvilIcons.ttf */,
465FAB230718430789478FBB /* FontAwesome.ttf */,
28D8B4CDF73A43A29C57263B /* Foundation.ttf */,
40D0AF613C1A4641A0FC53FD /* Ionicons.ttf */,
7412AE3E73704AF899BB23F1 /* MaterialIcons.ttf */,
2BFD8204FA6A400C87751025 /* Octicons.ttf */,
1CA555BF07B34B10AEBC86B0 /* Zocial.ttf */,
F318717567ED439CAA7CDD63 /* rubicon-icon-font.ttf */,
A2E4D4E194DC4F61B2E45B32 /* OFL.txt */,
3A8D4677A6794866B6FE678E /* MaterialCommunityIcons.ttf */,
F66044FAC633487E920F2E92 /* SimpleLineIcons.ttf */,
);
name = Resources;
sourceTree = "<group>";
Expand Down Expand Up @@ -270,7 +250,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n";
};
424FDCA7D9DE6B5D5871D305 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
Expand Down
10 changes: 0 additions & 10 deletions ios/ShoutemApp/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,6 @@
<array>
<string>rubicon-icon-font.ttf</string>
<string>Rubik-Regular.ttf</string>
<string>Entypo.ttf</string>
<string>EvilIcons.ttf</string>
<string>FontAwesome.ttf</string>
<string>Foundation.ttf</string>
<string>Ionicons.ttf</string>
<string>MaterialIcons.ttf</string>
<string>Octicons.ttf</string>
<string>Zocial.ttf</string>
<string>Rubik-Medium.ttf</string>
<string>Rubik-Black.ttf</string>
<string>Rubik-BlackItalic.ttf</string>
Expand All @@ -71,8 +63,6 @@
<string>Rubik-Light.ttf</string>
<string>Rubik-LightItalic.ttf</string>
<string>Rubik-MediumItalic.ttf</string>
<string>MaterialCommunityIcons.ttf</string>
<string>SimpleLineIcons.ttf</string>
<string>NotoSans-Bold.ttf</string>
<string>NotoSans-BoldItalic.ttf</string>
<string>NotoSans-Italic.ttf</string>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shoutem/platform",
"version": "5.2.1",
"version": "5.3.0",
"scripts": {
"android": "react-native run-android",
"build": "node scripts/build",
Expand Down
2 changes: 1 addition & 1 deletion package.template.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shoutem/platform",
"version": "5.2.1",
"version": "5.3.0",
"scripts": {
"android": "react-native run-android",
"build": "node scripts/build",
Expand Down
54 changes: 27 additions & 27 deletions platform/platform.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"version": "5.2.1",
"mobileAppVersion": "5.2.1",
"releaseNotes": "* Revisited extensions installed with new platforms",
"version": "5.3.0",
"mobileAppVersion": "5.3.0",
"releaseNotes": "* Introduced no-image placeholder\n* Potential breaking change for devs: 'react-native-vector-icons' icon fonts no longer pre-linked in binary, they must now be linked via 'preBuild' scripts",
"settings": {
"DEV-appetizeKey": "p8tvhz6ubhxbtkgvbv764abf1w",
"QA-appetizeKey": "akq626p83jdjuk251uxecqv8cm",
"Production-appetizeKey": "revxyb6vauc473uyh88a37u624"
"DEV-appetizeKey": "e4jq4nuwkw6z6ejfp62zu2q8ur",
"QA-appetizeKey": "b6p3zptqr2j28wb4qymhnbn3dr",
"Production-appetizeKey": "kg8rhthxfgbhevf8v4y6hmrumg"
},
"builds": {
"live": {
Expand All @@ -21,50 +21,50 @@
}
},
"dependencies": {
"shoutem.about": "~5.0.1",
"shoutem.about": "~5.0.2",
"shoutem.analytics": "~4.0.1",
"shoutem.application": "~4.0.2",
"shoutem.application": "~4.1.0",
"shoutem.audio": "~4.0.1",
"shoutem.auth": "~4.1.0",
"shoutem.camera": "~4.1.0",
"shoutem.cms": "~4.2.0",
"shoutem.code-push": "~4.0.1",
"shoutem.deals": "~5.0.3",
"shoutem.events": "~4.1.0",
"shoutem.code-push": "~4.1.0",
"shoutem.deals": "~5.1.0",
"shoutem.events": "~4.2.0",
"shoutem.favorites": "~4.0.1",
"shoutem.firebase": "~4.1.0",
"shoutem.flurry-analytics": "~4.0.1",
"shoutem.i18n": "~4.0.3",
"shoutem.ical-events": "~4.0.1",
"shoutem.layouts": "~5.0.0",
"shoutem.loyalty": "~4.0.4",
"shoutem.layouts": "~6.0.0",
"shoutem.loyalty": "~4.1.0",
"shoutem.navigation": "~4.0.7",
"shoutem.news": "~5.0.0",
"shoutem.notification-center": "~4.0.2",
"shoutem.news": "~5.1.0",
"shoutem.notification-center": "~4.1.0",
"shoutem.page": "~4.0.2",
"shoutem.people": "~4.0.2",
"shoutem.people": "~4.1.0",
"shoutem.permissions": "~4.0.2",
"shoutem.persist": "~4.0.1",
"shoutem.photos": "~4.1.0",
"shoutem.places": "~4.1.2",
"shoutem.places": "~5.0.0",
"shoutem.preview": "~4.0.1",
"shoutem.products": "~4.2.0",
"shoutem.products": "~4.3.0",
"shoutem.push-notifications": "~4.0.1",
"shoutem.redux": "~4.1.1",
"shoutem.rss": "~4.0.1",
"shoutem.rss-monitoring": "~4.0.1",
"shoutem.rss-news": "~4.0.2",
"shoutem.rss-photos": "~4.0.2",
"shoutem.rss-news": "~4.1.0",
"shoutem.rss-photos": "~4.1.0",
"shoutem.rss-videos": "~4.0.2",
"shoutem.rubicon-theme": "~4.3.2",
"shoutem.social": "~5.0.0",
"shoutem.rubicon-theme": "~4.3.5",
"shoutem.social": "~6.0.0",
"shoutem.sub-navigation": "~4.0.1",
"shoutem.theme": "~4.1.1",
"shoutem.user-profile": "~2.0.1",
"shoutem.theme": "~4.2.0",
"shoutem.user-profile": "~2.0.5",
"shoutem.video": "~6.0.0",
"shoutem.vimeo": "~4.0.1",
"shoutem.vimeo": "~4.1.0",
"shoutem.web-view": "~4.2.0",
"shoutem.wordpress": "~4.0.1",
"shoutem.youtube": "~4.0.1"
"shoutem.wordpress": "~4.1.0",
"shoutem.youtube": "~4.1.0"
}
}
30 changes: 21 additions & 9 deletions scripts/generate-translation-file.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,32 @@
#!/usr/bin/env node

const fs = require('fs-extra');
const path = require('path');

const EXT_PATH_ROOT = '../extensions/';
const PLATFORM_PATH = '../platform/platform.json';
const TRANSLATION_PATH = '/app/translations/en.json';
const EXT_PATH_ROOT = path.join('..', 'extensions');

// returns array of extensions from platform.json dependencies
function fetchPlatformExtensions() {
const platformJson = fs.readJsonSync(PLATFORM_PATH);
const IGNORED_EXTENSIONS = ['i18n'];

return Object.keys(platformJson.dependencies);
function fetchAllExtensions() {
const listOfExtensions = fs
.readdirSync(EXT_PATH_ROOT)
.filter(file => fs.lstatSync(path.join(EXT_PATH_ROOT, file)).isDirectory());

return listOfExtensions;
}

function getExtensionTranslations(extTitle) {
const translationPath = `${EXT_PATH_ROOT}/shoutem.${extTitle}${TRANSLATION_PATH}`;
if (IGNORED_EXTENSIONS.includes(extTitle)) {
return null;
}

const translationPath = path.join(
EXT_PATH_ROOT,
`shoutem.${extTitle}`,
'app',
'translations',
'en.json',
);

if (fs.existsSync(translationPath)) {
return fs.readJsonSync(translationPath);
Expand All @@ -25,7 +37,7 @@ function getExtensionTranslations(extTitle) {

function generateTranslationFile() {
let allTranslations = {};
const extensions = fetchPlatformExtensions();
const extensions = fetchAllExtensions();

extensions.forEach(extension => {
const extTitle = extension.replace('shoutem.', '');
Expand Down
61 changes: 61 additions & 0 deletions scripts/get-app-dependencies.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
const fs = require('fs-extra');
const glob = require('glob');
const _ = require('lodash');
const path = require('path');

function createDependenciesJson() {
const paths = glob.sync(path.join('..', 'extensions', '*'));

let dependencies = {};
const allNativeDependencies = [];

paths.forEach(extensionPath => {
const stat = fs.statSync(extensionPath);

if (stat && stat.isDirectory()) {
try {
const appPackageJsonPath = path.resolve(
path.join(extensionPath, 'app', 'package.json'),
);
const extensionJsonPath = path.resolve(
path.join(extensionPath, 'extension.json'),
);
const appPackageJsonStat = fs.statSync(appPackageJsonPath);

if (appPackageJsonStat && appPackageJsonStat.isFile()) {
const appPackageJson = fs.readJsonSync(appPackageJsonPath);

if (appPackageJson.dependencies) {
dependencies = { ...dependencies, ...appPackageJson.dependencies };
}

if (appPackageJson.nativeDependencies) {
appPackageJson.nativeDependencies.forEach(nativeDep =>
allNativeDependencies.push(nativeDep),
);
}
}
} catch (error) {
console.log(`Failed to load ${extensionPath} with error: ${error}`);
process.exit(1);
}
}
});

allNativeDependencies.sort();

let nativeDependencies;
_.uniq(allNativeDependencies).forEach(nativeDep => {
nativeDependencies = {
...nativeDependencies,
[nativeDep]: dependencies[nativeDep],
};
});

fs.writeJsonSync('dependencies.json', dependencies, { spaces: 2 });
fs.writeJsonSync('nativeDependencies.json', nativeDependencies, {
spaces: 2,
});
}

createDependenciesJson();
3 changes: 2 additions & 1 deletion scripts/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"name": "@shoutem/app-build-script",
"version": "0.1.0",
"version": "0.1.1",
"scripts": {
"generate-translations": "node generate-translation-file",
"get-app-dependencies": "node get-app-dependencies",
"reset-diff": "node manual-reset-diff",
"sanitize-diff": "node manual-sanitize-diff",
"update-platform-dependencies": "node update-platform-dependencies ../extensions"
Expand Down
Loading

0 comments on commit da4b811

Please sign in to comment.