From bbf4e68b6d64bfe819205a548a2942ccb724932f Mon Sep 17 00:00:00 2001
From: Cedric van Putten <me@bycedric.com>
Date: Fri, 22 Jan 2021 01:07:32 +0100
Subject: [PATCH] [config-plugins] Fix app gradle versionName replacement after
 ejecting twice (#3082)

* [config-plugins] Fix app gradle versionName replacement after ejecting twice

* Update packages/config-plugins/src/android/Version.ts

Co-authored-by: Evan Bacon <baconbrix@gmail.com>
---
 packages/config-plugins/src/android/Version.ts         | 10 ++--------
 .../src/android/__tests__/Version-test.ts              |  4 ++--
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/packages/config-plugins/src/android/Version.ts b/packages/config-plugins/src/android/Version.ts
index 7c688b456d..0af0af26d9 100644
--- a/packages/config-plugins/src/android/Version.ts
+++ b/packages/config-plugins/src/android/Version.ts
@@ -4,8 +4,6 @@ import { ConfigPlugin } from '../Plugin.types';
 import { withAppBuildGradle } from '../plugins/android-plugins';
 import * as WarningAggregator from '../utils/warnings';
 
-const DEFAULT_VERSION_NAME = '1.0';
-
 export const withVersion: ConfigPlugin = config => {
   return withAppBuildGradle(config, config => {
     if (config.modResults.language === 'groovy') {
@@ -25,17 +23,13 @@ export function getVersionName(config: Pick<ExpoConfig, 'version'>) {
   return config.version ?? null;
 }
 
-export function setVersionName(
-  config: Pick<ExpoConfig, 'version'>,
-  buildGradle: string,
-  versionToReplace = DEFAULT_VERSION_NAME
-) {
+export function setVersionName(config: Pick<ExpoConfig, 'version'>, buildGradle: string) {
   const versionName = getVersionName(config);
   if (versionName === null) {
     return buildGradle;
   }
 
-  const pattern = new RegExp(`versionName "${versionToReplace}"`);
+  const pattern = new RegExp(`versionName ".*"`);
   return buildGradle.replace(pattern, `versionName "${versionName}"`);
 }
 
diff --git a/packages/config-plugins/src/android/__tests__/Version-test.ts b/packages/config-plugins/src/android/__tests__/Version-test.ts
index cebf7836d9..bc23b41d39 100644
--- a/packages/config-plugins/src/android/__tests__/Version-test.ts
+++ b/packages/config-plugins/src/android/__tests__/Version-test.ts
@@ -47,8 +47,8 @@ describe('versionName', () => {
     );
   });
 
-  it(`replaces provided version name in build.gradle if version name is given`, () => {
-    expect(setVersionName({ version: '1.2.3' }, EXAMPLE_BUILD_GRADLE_2, '2.0')).toMatch(
+  it(`replaces provided version name in build.gradle if version name is not the default`, () => {
+    expect(setVersionName({ version: '1.2.3' }, EXAMPLE_BUILD_GRADLE_2)).toMatch(
       'versionName "1.2.3"'
     );
   });