Merge pull request #2223 from StoDevX/remove-danger-checks

Remove some faulty Danger checks

Author: hawkrives

dangerfile.js

@@ -8,9 +8,7 @@ import yarn from 'danger-plugin-yarn'
 
 // utilities
 import uniq from 'lodash/uniq'
-import isEqual from 'lodash/isEqual'
 import findIndex from 'lodash/findIndex'
-import plist from 'simple-plist'
 
 async function main() {
 	const taskName = String(process.env.task)
@@ -198,8 +196,6 @@ async function runJSのGeneral() {
 	await bigPr()
 	await exclusionaryTests()
 	await xcodeproj()
-	await gradle()
-	await infoPlist()
 }
 
 // New js files should have `@flow` at the top
@@ -263,7 +259,6 @@ async function xcodeproj() {
 	await pbxprojBlankLine()
 	await pbxprojLeadingZeros()
 	await pbxprojDuplicateLinkingPaths()
-	await pbxprojSidebarSorting()
 }
 
 // Warn about a blank line that Xcode will re-insert if we remove
@@ -347,194 +342,6 @@ async function pbxprojDuplicateLinkingPaths() {
 	)
 }
 
-// Warn about non-sorted frameworks in xcode sidebar
-async function pbxprojSidebarSorting() {
-	const pbxprojPath = danger.git.modified_files.find(filepath =>
-		filepath.endsWith('project.pbxproj'),
-	)
-	const xcodeproj = await parseXcodeProject(pbxprojPath)
-
-	const projectsInSidebar = xcodeproj.project.objects.PBXGroup
-	const sidebarSorting = Object.entries(projectsInSidebar)
-		.filter(([_, val] /*: [string, any]*/) => typeof val === 'object')
-		.filter(([_, val] /*: [string, any]*/) => val.name === 'Libraries')
-		.filter(([_, val] /*: [string, any]*/) => val.files)
-		.filter(([_, val] /*: [string, any]*/) => {
-			const projects = val.files.map(file => file.comment)
-			const sorted = [...projects].sort((a, b) => a.localeSort(b))
-			return !isEqual(projects, sorted)
-		})
-
-	if (sidebarSorting.length) {
-		return
-	}
-
-	warn(
-		h.details(
-			h.summary(
-				"Some of the iOS frameworks aren't sorted alphabetically in the Xcode sidebar (under Libraries). Please sort them alphabetically. Thanks!",
-			),
-			"If you right-click on the Libraries group in the sidebar, you can just pick 'Sort by Name' and Xcode will do it for you.",
-		),
-	)
-}
-
-// Make sure the Info.plist `NSLocationWhenInUseUsageDescription` didn't switch to entities
-function infoPlist() {
-	const infoPlistChanged = danger.git.modified_files.find(filepath =>
-		filepath.endsWith('Info.plist'),
-	)
-	if (!infoPlistChanged) {
-		return
-	}
-
-	const parsed = plist.parse(readFile(infoPlistChanged))
-	const descKeysWithEntities = Object.keys(parsed)
-		.filter(key => key.endsWith('Description'))
-		.filter(key => parsed[key].includes("'")) // look for single quotes
-
-	if (!descKeysWithEntities.length) {
-		return
-	}
-
-	warn(
-		h.details(
-			h.summary(
-				'Some Info.plist descriptions were rewritten by something to include single quotes.',
-			),
-			h.p(
-				"Xcode will rewrite them to use the <code>&amp;apos;</code> XML entity; would you please change them for us, so that Xcode doesn't have to?",
-			),
-			h.ul(
-				...descKeysWithEntities.map(key => {
-					const val = entities.encode(parsed[key])
-					const escaped = entities.encode(val.replace(/'/g, '&apos;'))
-					return h.li(
-						h.p(h.code(key) + ':'),
-						h.blockquote(val),
-						h.p('should become'),
-						h.blockquote(escaped),
-					)
-				}),
-			),
-		),
-	)
-}
-
-async function gradle() {
-	await buildDotGradle()
-	await mainDotJava()
-	await settingsDotGradleSpacing()
-}
-
-// Ensure that the build.gradle dependencies list is sorted
-function buildDotGradle() {
-	const buildDotGradle = danger.git.modified_files.find(
-		filepath => filepath === 'android/app/build.gradle',
-	)
-	if (!buildDotGradle) {
-		return
-	}
-
-	const file = readFile(buildDotGradle).split('\n')
-	const startLine = findIndex(file, line => line === 'dependencies {')
-	const endLine = findIndex(file, line => line === '}', startLine)
-
-	const linesToSort = file
-		.slice(startLine + 1, endLine - 1)
-		.map(line => line.trim())
-		.filter(line => !line.startsWith('//'))
-
-	const sorted = [...linesToSort].sort()
-
-	if (isEqual(linesToSort, sorted)) {
-		return
-	}
-
-	const firstEntry = linesToSort[0]
-	warn(
-		h.details(
-			h.summary(
-				"We like to keep the <code>build.gradle</code>'s list of dependencies sorted alphabetically.",
-			),
-			h.p(`Was the first entry, <code>${firstEntry}</code>, out of place?`),
-		),
-	)
-}
-
-// Ensure that the MainApplication.java imports list is sorted
-function mainDotJava() {
-	const mainDotJava = danger.git.modified_files.find(filepath =>
-		filepath.endsWith('MainApplication.java'),
-	)
-	if (!mainDotJava) {
-		return
-	}
-
-	const file = readFile(mainDotJava).split('\n')
-	const startNeedle = '// keep these sorted alphabetically'
-	const startLine = findIndex(file, line => line === startNeedle)
-	const endLine = findIndex(file, line => line === '', startLine)
-
-	const linesToSort = file
-		.slice(startLine + 1, endLine - 1)
-		.map(line => line.trim())
-
-	const sorted = [...linesToSort].sort()
-
-	if (isEqual(linesToSort, sorted)) {
-		return
-	}
-
-	// react-native link inserts the new import right after the RN import
-	const rnImportLine = findIndex(
-		file,
-		line => line === 'import com.facebook.react.ReactApplication;',
-	)
-	const problemEntry = file[rnImportLine + 1]
-	const problemLine = rnImportLine - startLine + 1
-	warn(
-		h.details(
-			h.summary(
-				"We like to keep the <code>MainApplication.java</code>'s list of imports sorted alphabetically.",
-			),
-			h.p(
-				`Was the number ${problemLine} entry, <code>${problemEntry}</code>, out of place?`,
-			),
-		),
-	)
-}
-
-// Enforce spacing in the settings.gradle file
-function settingsDotGradleSpacing() {
-	const settingsDotGradle = danger.git.modified_files.find(
-		filepath => filepath === 'android/settings.gradle',
-	)
-	if (!settingsDotGradle) {
-		return
-	}
-
-	const file = readFile(settingsDotGradle).split('\n')
-	const startLine = findIndex(file, line => line.startsWith('//'))
-	const firstInclusionLine = findIndex(file, line => line.startsWith('include'))
-
-	if (firstInclusionLine >= startLine) {
-		return
-	}
-
-	const firstEntry = file[firstInclusionLine]
-	warn(
-		h.details(
-			h.summary(
-				"We like to keep the <code>settings.gradle</code>'s list of imports sorted alphabetically.",
-			),
-			h.p(
-				`It looks like the first entry, <code>${firstEntry}</code>, is out of place.`,
-			),
-		),
-	)
-}
-
 //
 // task=JS-flow
 //
@@ -630,9 +437,6 @@ import util from 'util'
 
 const execFile = util.promisify(childProcess.execFile)
 
-const {XmlEntities} = require('html-entities')
-const entities = new XmlEntities()
-
 function fastlaneBuildLogTail(log /*: Array<string>*/, message /*: string*/) {
 	const n = 150
 	const logToPost = log

package.json

@@ -141,7 +141,6 @@
     "pretty-quick": "1.2.2",
     "prop-types": "15.6.0",
     "react-test-renderer": "16.2.0",
-    "simple-plist": "0.2.1",
     "string-natural-compare": "2.0.2",
     "strip-ansi": "4.0.0",
     "xcode": "1.0.0"

yarn.lock

@@ -5396,7 +5396,7 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
-simple-plist@0.2.1, simple-plist@^0.2.1:
+simple-plist@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/simple-plist/-/simple-plist-0.2.1.tgz#71766db352326928cf3a807242ba762322636723"
   dependencies: