Merge pull request #220 from simde-utc/release/v1.1.2

Release v1.1.2

android/app/build.gradle

@@ -151,7 +151,6 @@ android {
 
 dependencies {
     implementation project(':react-native-vector-icons')
-    implementation project(':react-native-version-number')
     implementation project(':react-native-svg')
     implementation project(':react-native-reanimated')
     implementation project(':react-native-gesture-handler')

android/app/src/main/java/fr/utc/assos/simde/payutc/MainApplication.java

@@ -4,7 +4,6 @@
 
 import com.facebook.react.ReactApplication;
 import com.oblador.vectoricons.VectorIconsPackage;
-import com.apsl.versionnumber.RNVersionNumberPackage;
 import com.horcrux.svg.SvgPackage;
 import com.swmansion.reanimated.ReanimatedPackage;
 import com.facebook.react.ReactNativeHost;
@@ -43,7 +42,6 @@ protected List<ReactPackage> getPackages() {
       return Arrays.<ReactPackage>asList(
           new MainReactPackage(),
             new VectorIconsPackage(),
-            new RNVersionNumberPackage(),
             new SvgPackage(),
           new ReanimatedPackage(),
           new RNGestureHandlerPackage(),

android/build.gradle

@@ -7,8 +7,8 @@ buildscript {
         compileSdkVersion = 29
         targetSdkVersion = 29
         supportLibVersion = "28.0.0"
-        versionCode = 6
-        versionName = "1.1.1"
+        versionCode = 7
+        versionName = "1.1.2"
     }
     repositories {
         google()

android/settings.gradle

@@ -1,8 +1,6 @@
 apply from: '../node_modules/react-native-unimodules/gradle.groovy'
 include ':react-native-vector-icons'
 project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
-include ':react-native-version-number'
-project(':react-native-version-number').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-version-number/android')
 include ':react-native-svg'
 project(':react-native-svg').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-svg/android')
 include ':react-native-reanimated'

app.json

@@ -37,6 +37,6 @@
   },
   "displayName": "PayUTC",
   "name": "PayUTC",
-  "versionCode": 6,
-  "versionName": "1.1.1"
+  "versionCode": 7,
+  "versionName": "1.1.2"
 }

assets/changelogs/en.json

@@ -1,4 +1,15 @@
 [
+	{
+		"version": "v1.1.2",
+		"data": [
+			{
+				"title": "Changes",
+				"data": [
+					"Load news directly in application"
+				]
+			},
+		]
+	},
 	{
 		"version": "v1.1.1",
 		"data": [

assets/changelogs/fr.json

@@ -1,4 +1,15 @@
 [
+	{
+		"version": "v1.1.2",
+		"data": [
+			{
+				"title": "Modifications",
+				"data": [
+					"Chargement des nouveautés dans l'application"
+				]
+			},
+		]
+	},
 	{
 		"version": "v1.1.1",
 		"data": [

config.example.js

@@ -19,6 +19,9 @@ export const GITHUB_URL = '';
 // GitHub API url.
 export const GITHUB_API_URL = '';
 
+// GitHub changelogs url.
+export const GITHUB_CHANGELOG_URL = '';
+
 // Cas ticket resolution url.
 export const CAS_URL = '';
 
@@ -82,6 +85,7 @@ export default {
 	PORTAIL_URL,
 	GITHUB_URL,
 	GITHUB_API_URL,
+	GITHUB_CHANGELOG_URL,
 	CAS_URL,
 	PAYUTC_API_URL,
 	PAYUTC_VERSION,

ios/PayUTC/Info.plist

@@ -16,10 +16,10 @@
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
-	<key>CFBundleShortVersionString</key><string>1.1.1</string>
+	<key>CFBundleShortVersionString</key><string>1.1.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
-	<key>CFBundleVersion</key><string>6</string>
+	<key>CFBundleVersion</key><string>7</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

ios/Podfile

@@ -33,7 +33,6 @@ target 'PayUTC' do
 
   pod 'RNSVG', :path => '../node_modules/react-native-svg'
 
-  pod 'react-native-version-number', :path => '../node_modules/react-native-version-number'
 
   pod 'RNVectorIcons', :path => '../node_modules/react-native-vector-icons'
 

package.json

@@ -20,24 +20,23 @@
     "version:description:android": "node assets/scripts/get_android_description.js"
   },
   "dependencies": {
-    "expo": "^34.0.1",
-    "react": "16.8.3",
-    "react-dom": "^16.8.6",
-    "react-native-web": "^0.11.4",
-    "react-native": "0.59.10",
-    "react-native-gesture-handler": "^1.3.0",
-    "react-native-reanimated": "~1.1.0",
-    "react-native-unimodules": "~0.5.2",
     "@fortawesome/fontawesome-svg-core": "^1.2.21",
     "@fortawesome/free-solid-svg-icons": "^5.10.1",
     "@fortawesome/react-native-fontawesome": "^0.1.0",
+    "expo": "^34.0.1",
     "expo-file-system": "^6.0.2",
     "i18n-js": "^3.3.0",
+    "react": "16.8.3",
+    "react-dom": "^16.8.6",
+    "react-native": "0.59.10",
+    "react-native-gesture-handler": "^1.3.0",
     "react-native-keyboard-aware-scroll-view": "^0.8.0",
     "react-native-loading-spinner-overlay": "^1.0.1",
+    "react-native-reanimated": "~1.1.0",
     "react-native-svg": "~9.5.1",
+    "react-native-unimodules": "~0.5.2",
     "react-native-vector-icons": "^6.6.0",
-    "react-native-version-number": "^0.3.6",
+    "react-native-web": "^0.11.4",
     "react-navigation": "^3.11.1",
     "react-redux": "^7.1.0",
     "redux": "^4.0.4",

src/screens/AppLoader.js

@@ -9,7 +9,6 @@
 
 import React from 'react';
 import { View, Text, Image, Platform, NativeModules, Alert, ActivityIndicator } from 'react-native';
-import VersionNumber from 'react-native-version-number';
 import { connect } from 'react-redux';
 import { library } from '@fortawesome/fontawesome-svg-core';
 import { fas } from '@fortawesome/free-solid-svg-icons';
@@ -23,10 +22,11 @@ import colors from '../styles/colors';
 import { GitHub, Config } from '../redux/actions';
 import i18n, { _, AppLoader as t } from '../utils/i18n';
 import config from '../../config';
+import appJson from '../../app.json';
 import configExemple from '../../config.example';
 
 const REGEX_VERSION = /^([0-9])+\.([0-9])+\.([0-9])-*.*$/;
-const REGEX_DEPRECATED_VERSION = /# Deprecated versions: < v(.*)$/;
+const REGEX_DEPRECATED_VERSION = /# Deprecated versions: < v(.*)/;
 
 class AppLoaderScreen extends React.Component {
 	static loadLibrairies() {
@@ -85,15 +85,15 @@ class AppLoaderScreen extends React.Component {
 		dispatch(action);
 
 		return action.payload.then(([{ body, tag_name: tagName }]) => {
-			const { appVersion } = VersionNumber;
+			const { versionName } = appJson;
 
-			if (appVersion && tagName && `v${appVersion}` !== tagName) {
+			if (versionName && tagName && `v${versionName}` !== tagName) {
 				const matches = body.match(REGEX_DEPRECATED_VERSION);
 
 				if (
 					matches &&
 					matches.length === 2 &&
-					!AppLoaderScreen.isVersionValid(appVersion, matches[1])
+					!AppLoaderScreen.isVersionValid(versionName, matches[1])
 				) {
 					Alert.alert(
 						t('need_update'),

src/screens/Settings/AboutScreen.js

@@ -8,11 +8,11 @@
 import React from 'react';
 import { ScrollView, View, Linking, Text } from 'react-native';
 import { connect } from 'react-redux';
-import VersionNumber from 'react-native-version-number';
 import colors from '../../styles/colors';
 import LinkButton from '../../components/LinkButton';
 import Paragraphe from '../../components/Paragraphe';
 import { _, About as t } from '../../utils/i18n';
+import appJson from '../../../app.json';
 import { GitHub } from '../../redux/actions';
 import GitHubService from '../../services/GitHub';
 
@@ -39,13 +39,13 @@ class AboutScreen extends React.Component {
 			releaseFetching,
 			navigation,
 		} = this.props;
-		let { appVersion } = VersionNumber;
+		let { versionName } = appJson;
 
 		if (releaseFetching) {
 			return [_('loading_text_replacement'), null, _('loading_text_replacement'), () => {}];
 		}
 
-		if (!tagName || !appVersion) {
+		if (!tagName || !versionName) {
 			return [
 				t('dev_version'),
 				colors.more,
@@ -54,21 +54,21 @@ class AboutScreen extends React.Component {
 			];
 		}
 
-		appVersion = `v${appVersion}`;
+		versionName = `v${versionName}`;
 
-		if (tagName === appVersion) {
+		if (tagName === versionName) {
 			return [
 				t('up_to_date'),
 				colors.more,
-				t('actual_version', { current: appVersion }),
+				t('actual_version', { current: versionName }),
 				() => navigation.navigate('Changelog'),
 			];
 		}
 
 		return [
 			t('need_update'),
 			colors.less,
-			t('update_version', { current: appVersion, next: tagName }),
+			t('update_version', { current: versionName, next: tagName }),
 			() => navigation.navigate('Changelog'),
 		];
 	}