From 9413496e085ed23570540c8e6acdf9e47f6340b4 Mon Sep 17 00:00:00 2001 From: Chris Polcyn Date: Wed, 28 Jun 2017 10:47:41 -0700 Subject: [PATCH 1/3] sort gitignore items --- .gitignore | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 414301f..2a63b54 100644 --- a/.gitignore +++ b/.gitignore @@ -1,25 +1,25 @@ +.*.swp .DS_Store .appcloud .externalToolBuilders .project .settings -build.properties -salesforce.schema -Referenced Packages -/destructiveChanges.xml /admin_profile -/uninstall -/uninstallsrc +/destructiveChanges.xml /installdeploy /installedPackages /org_unpackaged +/packaged /src.orig +/test_results.json +/test_results_junit.xml +/uninstall +/uninstallsrc /unpackaged/*/*/*.zip /unpackaged/namespaced_zipped /unpackaged/zipped /unpackaged_stage -/packaged -/test_results.json -/test_results_junit.xml /venv -.*.swp +Referenced Packages +build.properties +salesforce.schema From c0b8211c16b326e7302096c718128ee86231d39a Mon Sep 17 00:00:00 2001 From: Chris Polcyn Date: Wed, 28 Jun 2017 11:59:34 -0700 Subject: [PATCH 2/3] update for sfdx beta --- .gitignore | 2 ++ orgs/beta.json | 19 +++++++++---------- orgs/dev.json | 21 ++++++++++----------- orgs/feature.json | 21 ++++++++++----------- orgs/release.json | 19 +++++++++---------- sfdx-project.json | 10 ++++++++++ sfdx-workspace.json | 10 ---------- workspace-config.json | 6 ------ 8 files changed, 50 insertions(+), 58 deletions(-) create mode 100644 sfdx-project.json delete mode 100644 sfdx-workspace.json delete mode 100644 workspace-config.json diff --git a/.gitignore b/.gitignore index 2a63b54..1dba882 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ .project .settings /admin_profile +/browser_tests /destructiveChanges.xml /installdeploy /installedPackages @@ -12,6 +13,7 @@ /packaged /src.orig /test_results.json +/test_results.xml /test_results_junit.xml /uninstall /uninstallsrc diff --git a/orgs/beta.json b/orgs/beta.json index e1f9073..326eaab 100644 --- a/orgs/beta.json +++ b/orgs/beta.json @@ -1,12 +1,11 @@ { - "Company": "Affiliations - Beta Test Org", - "Country": "US", - "LastName": "Belvedere", - "Email": "mrbelvedere@salesforce.org", - "Edition": "Developer", - "OrgPreferences" : { - "DisableParallelApexTesting" : true, - "S1DesktopEnabled" : true, - "ChatterEnabled" : true + "edition": "Developer", + "orgName": "Affiliations - Beta Test Org", + "orgPreferences": { + "enabled": [ + "ChatterEnabled", + "S1DesktopEnabled", + "DisableParallelApexTesting" + ] } -} +} \ No newline at end of file diff --git a/orgs/dev.json b/orgs/dev.json index 111baa7..612de1e 100644 --- a/orgs/dev.json +++ b/orgs/dev.json @@ -1,13 +1,12 @@ { - "Company": "Affiliations - Dev Workspace", - "Country": "US", - "LastName": "Belvedere", - "Email": "mrbelvedere@salesforce.org", - "Edition": "Developer", - "OrgPreferences" : { - "DisableParallelApexTesting" : true, - "S1DesktopEnabled" : true, - "Translation" : true, - "ChatterEnabled" : true + "edition": "Developer", + "orgName": "Affiliations - Dev Workspace", + "orgPreferences": { + "enabled": [ + "ChatterEnabled", + "Translation", + "S1DesktopEnabled", + "DisableParallelApexTesting" + ] } -} +} \ No newline at end of file diff --git a/orgs/feature.json b/orgs/feature.json index 9c24574..acddbc6 100644 --- a/orgs/feature.json +++ b/orgs/feature.json @@ -1,13 +1,12 @@ { - "Company": "Affiliations - Feature Test Org", - "Country": "US", - "LastName": "Belvedere", - "Email": "mrbelvedere@salesforce.org", - "Edition": "Developer", - "OrgPreferences" : { - "DisableParallelApexTesting" : true, - "S1DesktopEnabled" : true, - "Translation" : true, - "ChatterEnabled" : true + "edition": "Developer", + "orgName": "Affiliations - Feature Test Org", + "orgPreferences": { + "enabled": [ + "ChatterEnabled", + "Translation", + "S1DesktopEnabled", + "DisableParallelApexTesting" + ] } -} +} \ No newline at end of file diff --git a/orgs/release.json b/orgs/release.json index aa5217c..3854950 100644 --- a/orgs/release.json +++ b/orgs/release.json @@ -1,12 +1,11 @@ { - "Company": "Affiliations - Release Test Org", - "Country": "US", - "LastName": "Belvedere", - "Email": "mrbelvedere@salesforce.org", - "Edition": "Developer", - "OrgPreferences" : { - "DisableParallelApexTesting" : true, - "S1DesktopEnabled" : true, - "ChatterEnabled" : true + "edition": "Developer", + "orgName": "Affiliations - Release Test Org", + "orgPreferences": { + "enabled": [ + "ChatterEnabled", + "S1DesktopEnabled", + "DisableParallelApexTesting" + ] } -} +} \ No newline at end of file diff --git a/sfdx-project.json b/sfdx-project.json new file mode 100644 index 0000000..245bbbf --- /dev/null +++ b/sfdx-project.json @@ -0,0 +1,10 @@ +{ + "packageDirectories": [ + { + "path": "src", + "default": true + } + ], + "namespace": "npe5", + "sourceApiVersion": "36.0" +} diff --git a/sfdx-workspace.json b/sfdx-workspace.json deleted file mode 100644 index 9b652cb..0000000 --- a/sfdx-workspace.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "PackageDirectories": [ - { - "Path": "src", - "Default": true - } - ], - "Namespace": "npe5", - "SourceApiVersion": "36.0" -} diff --git a/workspace-config.json b/workspace-config.json deleted file mode 100644 index 89309ef..0000000 --- a/workspace-config.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "DefaultArtifact": "src", - "SfdcLoginUrl" : "https://gs0.salesforce.com", - "ApiVersion": "38.0", - "EnableTokenEncryption": false -} From d5948877cd1af30cbc5b8ad46ac5ba6d80bdcb66 Mon Sep 17 00:00:00 2001 From: Chris Polcyn Date: Wed, 28 Jun 2017 13:25:29 -0700 Subject: [PATCH 3/3] use empty namespace in sfdx-project.json --- sfdx-project.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sfdx-project.json b/sfdx-project.json index 245bbbf..78610bd 100644 --- a/sfdx-project.json +++ b/sfdx-project.json @@ -5,6 +5,6 @@ "default": true } ], - "namespace": "npe5", + "namespace": "", "sourceApiVersion": "36.0" }