From 053f937bc1255c1988b793444fd9844569e1a4e4 Mon Sep 17 00:00:00 2001 From: Qin Zhengquan Date: Fri, 26 Jul 2019 01:41:00 +0800 Subject: [PATCH] fix: Execution failed for task :app:mergeReleaseResources for react-native run-android --variant=release caused by Duplicate resources interpretation --- src/Icon.js | 2 +- src/{fonts => config}/galio.json | 0 src/index.js | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename src/{fonts => config}/galio.json (100%) diff --git a/src/Icon.js b/src/Icon.js index 187f983..e9e5804 100644 --- a/src/Icon.js +++ b/src/Icon.js @@ -4,7 +4,7 @@ import PropTypes from 'prop-types'; import GalioTheme, { withGalio } from './theme'; import getIconType from './helpers/getIconType'; -import galioConfig from './fonts/galio.json'; +import galioConfig from './config/galio.json'; const Galio = createIconSetFromIcoMoon(galioConfig, 'Galio', './fonts/galio.ttf'); diff --git a/src/fonts/galio.json b/src/config/galio.json similarity index 100% rename from src/fonts/galio.json rename to src/config/galio.json diff --git a/src/index.js b/src/index.js index 62e7e9e..bdc8bf3 100644 --- a/src/index.js +++ b/src/index.js @@ -11,10 +11,10 @@ import Switch from './Switch'; import Text from './Text'; import theme, { withGalio, GalioProvider } from './theme'; -import galioConfig from './fonts/galio.json'; +import galioConfig from './config/galio.json'; const GalioFont = require('./fonts/galio.ttf'); -export { +export { Block, Button, Card,