Skip to content

Commit

Permalink
Merge pull request #100 from shoutem/release/3.0.1
Browse files Browse the repository at this point in the history
Release/3.0.1
  • Loading branch information
Definitely-Not-Vlad authored Sep 6, 2021
2 parents a3c64fb + ca1b632 commit 705e09d
Show file tree
Hide file tree
Showing 9 changed files with 528 additions and 229 deletions.
4 changes: 4 additions & 0 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@

<!--//NativeModuleInjectionMark-android-manifest-root-->

<queries>
<!--//NativeModuleInjectionMark-android-manifest-queries-->
</queries>

<application tools:replace="android:label,android:appComponentFactory"
android:appComponentFactory="dummyProperty"
android:usesCleartextTraffic="true"
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
jcenter()
}
dependencies {
classpath("com.android.tools.build:gradle:3.5.3")
classpath("com.android.tools.build:gradle:3.5.4")
//NativeModuleInjectionMark-root-gradle

// NOTE: Do not place your application dependencies here; they belong
Expand Down
9 changes: 3 additions & 6 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
import 'es6-symbol/implement';
import 'react-native-gesture-handler';

import React from 'react';
import {
AppRegistry,
} from 'react-native';
import { AppRegistry } from 'react-native';

import { AppBuilder } from 'shoutem-core';
import { NavigationBar } from '@shoutem/ui';

import extensions from './extensions.js';

function renderNavigationBar(navBarProps) {
return (
<NavigationBar {...navBarProps} />
);
return <NavigationBar {...navBarProps} />;
}

const App = new AppBuilder()
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": "3.0.0",
"version": "3.0.1",
"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": "3.0.0",
"version": "3.0.1",
"scripts": {
"android": "react-native run-android",
"build": "node scripts/build",
Expand Down
34 changes: 17 additions & 17 deletions platform/platform.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": "3.0.0",
"mobileAppVersion": "3.0.0",
"releaseNotes": "* Reworked and updated navigation across extensions",
"version": "3.0.1",
"mobileAppVersion": "3.0.1",
"releaseNotes": "* Fixed Android 11 issue with Phone and Email contact buttons\n* Fixed search field UI issues",
"settings": {
"DEV-appetizeKey": "tmbt6dp2z7dafedwuc3z2b586r",
"QA-appetizeKey": "mu8a6zv0xptggaezkyzr9v141r",
Expand All @@ -21,7 +21,7 @@
}
},
"dependencies": {
"shoutem.about": "~3.0.0",
"shoutem.about": "~3.0.1",
"shoutem.analytics": "~3.0.0",
"shoutem.application": "~3.0.0",
"shoutem.audio": "~3.0.0",
Expand All @@ -30,36 +30,36 @@
"shoutem.cms": "~3.0.0",
"shoutem.code-push": "~3.0.0",
"shoutem.deals": "~3.0.0",
"shoutem.events": "~3.0.0",
"shoutem.events": "~3.0.1",
"shoutem.favorites": "~3.0.0",
"shoutem.firebase": "~3.0.0",
"shoutem.flurry-analytics": "~3.0.0",
"shoutem.i18n": "~3.0.0",
"shoutem.ical-events": "~3.0.0",
"shoutem.layouts": "~3.0.0",
"shoutem.loyalty": "~3.0.0",
"shoutem.navigation": "~3.0.0",
"shoutem.news": "~3.0.0",
"shoutem.loyalty": "~3.0.3",
"shoutem.navigation": "~3.0.6",
"shoutem.news": "~3.1.0",
"shoutem.notification-center": "~3.0.0",
"shoutem.page": "~3.0.0",
"shoutem.people": "~3.0.0",
"shoutem.page": "~3.0.3",
"shoutem.people": "~3.0.2",
"shoutem.permissions": "~3.0.0",
"shoutem.persist": "~3.0.0",
"shoutem.photos": "~3.0.0",
"shoutem.places": "~3.0.0",
"shoutem.photos": "~3.0.1",
"shoutem.places": "~3.1.0",
"shoutem.preview": "~3.0.0",
"shoutem.products": "~3.0.0",
"shoutem.products": "~3.0.1",
"shoutem.push-notifications": "~3.0.0",
"shoutem.redux": "~3.0.0",
"shoutem.rss": "~3.0.0",
"shoutem.rss-monitoring": "~3.0.0",
"shoutem.rss-news": "~3.0.0",
"shoutem.rss-news": "~3.0.1",
"shoutem.rss-photos": "~3.0.0",
"shoutem.rss-videos": "~3.0.0",
"shoutem.rubicon-theme": "~3.0.0",
"shoutem.social": "~3.0.0",
"shoutem.rubicon-theme": "~3.0.4",
"shoutem.social": "~3.1.1",
"shoutem.sub-navigation": "~3.0.0",
"shoutem.theme": "~3.0.0",
"shoutem.theme": "~3.0.1",
"shoutem.video": "~3.0.0",
"shoutem.vimeo": "~3.0.0",
"shoutem.web-view": "~3.0.0",
Expand Down
29 changes: 19 additions & 10 deletions scripts/helpers/const.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,24 +68,29 @@ const ANCHORS = {
APP_DELEGATE: {
IMPORT: '//NativeModuleInjectionMark-appDelegate-import',
// eslint-disable-next-line max-len
DID_FINISH_LAUNCHING_WITH_OPTIONS: '//NativeModuleInjectionMark-appDelegate-applicationDidFinishLaunchingWithOptions',
DID_FINISH_LAUNCHING_WITH_OPTIONS:
'//NativeModuleInjectionMark-appDelegate-applicationDidFinishLaunchingWithOptions',
// eslint-disable-next-line max-len
DID_FINISH_LAUNCHING_WITH_OPTIONS_END: '//NativeModuleInjectionMark-appDelegate-applicationDidFinishLaunchingWithOptions-end',
DID_FINISH_LAUNCHING_WITH_OPTIONS_END:
'//NativeModuleInjectionMark-appDelegate-applicationDidFinishLaunchingWithOptions-end',
BODY: '//NativeModuleInjectionMark-appDelegate-body',
},
APP_DELEGATE_HEADER: {
IMPORT: '//NativeModuleInjectionMark-appDelegateHeader-import',
},
ENTITLEMENTS: {
ADD_ENTITLEMENTS: '<!-- //NativeModuleInjectionMark-entitlements-addEntitlements -->',
}
ADD_ENTITLEMENTS:
'<!-- //NativeModuleInjectionMark-entitlements-addEntitlements -->',
},
},
ANDROID: {
MAIN_ACTIVITY: {
IMPORT: '//NativeModuleInjectionMark-mainActivity-import',
ON_CREATE: '//NativeModuleInjectionMark-mainActivity-onCreate',
ON_ACTIVITY_RESULT: '//NativeModuleInjectionMark-mainActivity-onActivityResult',
ON_ACTIVITY_RESULT_END: '//NativeModuleInjectionMark-mainActivity-onActivityResult-end',
ON_ACTIVITY_RESULT:
'//NativeModuleInjectionMark-mainActivity-onActivityResult',
ON_ACTIVITY_RESULT_END:
'//NativeModuleInjectionMark-mainActivity-onActivityResult-end',
},
MAIN_APPLICATION: {
IMPORT: '//NativeModuleInjectionMark-mainApplication-import',
Expand All @@ -100,22 +105,26 @@ const ANCHORS = {
DEFAULT_CONFIG: '//NativeModuleInjectionMark-app-gradle-default-config',
PLUGINS: '//NativeModuleInjectionMark-app-gradle-plugins',
BUILD_TYPES: {
UNSIGNED_RELEASE: '//NativeModuleInjectionMark-app-gradle-buildTypes-unsignedRelease',
UNSIGNED_RELEASE:
'//NativeModuleInjectionMark-app-gradle-buildTypes-unsignedRelease',
RELEASE: '//NativeModuleInjectionMark-app-gradle-buildTypes-release',
DEBUG: '//NativeModuleInjectionMark-app-gradle-buildTypes-debug',
},
REACT_GRADLE: '//NativeModuleInjectionMark-app-gradle-reactGradle',
ANDROID: '//NativeModuleInjectionMark-app-gradle-android',
ANDROID_END: '//NativeModuleInjectionMark-app-gradle-android-end'
ANDROID_END: '//NativeModuleInjectionMark-app-gradle-android-end',
},
ROOT_GRADLE: '//NativeModuleInjectionMark-root-gradle',
ROOT_GRADLE_ALLPROJECTS_REPOSITORIES: '//NativeModuleInjectionMark-root-gradle-allprojects-repositories',
ROOT_GRADLE_ALLPROJECTS_REPOSITORIES:
'//NativeModuleInjectionMark-root-gradle-allprojects-repositories',
PROPERTIES: '#NativeModuleInjectionMark-gradle-properties',
SETTINGS: '//NativeModuleInjectionMark-gradle-settings',
},
MANIFEST: {
ROOT: '<!--//NativeModuleInjectionMark-android-manifest-root-->',
APPLICATION: '<!--//NativeModuleInjectionMark-android-manifest-application-->',
QUERIES: '<!--//NativeModuleInjectionMark-android-manifest-queries-->',
APPLICATION:
'<!--//NativeModuleInjectionMark-android-manifest-application-->',
},
},
};
Expand Down
2 changes: 2 additions & 0 deletions scripts/update-platform-dependencies.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@ const extensionsToIgnore = [
'advertising',
'besttime',
'books',
'checklist',
'interactive-faq',
'in-app-purchases',
'menu',
'onboarding',
'podcast',
'radio',
'radio-player',
'sendbird',
'shopify',
];
Expand Down
Loading

0 comments on commit 705e09d

Please sign in to comment.