Skip to content

Commit

Permalink
Merge pull request #23 from SalesforceFoundation/feature/sfdx-beta
Browse files Browse the repository at this point in the history
SFDX beta
  • Loading branch information
cpolcyn authored Jun 28, 2017
2 parents 5c15f91 + d594887 commit e6d8647
Show file tree
Hide file tree
Showing 8 changed files with 60 additions and 68 deletions.
22 changes: 12 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
.*.swp
.DS_Store
.appcloud
.externalToolBuilders
.project
.settings
build.properties
salesforce.schema
Referenced Packages
/destructiveChanges.xml
/admin_profile
/uninstall
/uninstallsrc
/browser_tests
/destructiveChanges.xml
/installdeploy
/installedPackages
/org_unpackaged
/packaged
/src.orig
/test_results.json
/test_results.xml
/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
19 changes: 9 additions & 10 deletions orgs/beta.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{
"Company": "Affiliations - Beta Test Org",
"Country": "US",
"LastName": "Belvedere",
"Email": "[email protected]",
"Edition": "Developer",
"OrgPreferences" : {
"DisableParallelApexTesting" : true,
"S1DesktopEnabled" : true,
"ChatterEnabled" : true
"edition": "Developer",
"orgName": "Affiliations - Beta Test Org",
"orgPreferences": {
"enabled": [
"ChatterEnabled",
"S1DesktopEnabled",
"DisableParallelApexTesting"
]
}
}
}
21 changes: 10 additions & 11 deletions orgs/dev.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
{
"Company": "Affiliations - Dev Workspace",
"Country": "US",
"LastName": "Belvedere",
"Email": "[email protected]",
"Edition": "Developer",
"OrgPreferences" : {
"DisableParallelApexTesting" : true,
"S1DesktopEnabled" : true,
"Translation" : true,
"ChatterEnabled" : true
"edition": "Developer",
"orgName": "Affiliations - Dev Workspace",
"orgPreferences": {
"enabled": [
"ChatterEnabled",
"Translation",
"S1DesktopEnabled",
"DisableParallelApexTesting"
]
}
}
}
21 changes: 10 additions & 11 deletions orgs/feature.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
{
"Company": "Affiliations - Feature Test Org",
"Country": "US",
"LastName": "Belvedere",
"Email": "[email protected]",
"Edition": "Developer",
"OrgPreferences" : {
"DisableParallelApexTesting" : true,
"S1DesktopEnabled" : true,
"Translation" : true,
"ChatterEnabled" : true
"edition": "Developer",
"orgName": "Affiliations - Feature Test Org",
"orgPreferences": {
"enabled": [
"ChatterEnabled",
"Translation",
"S1DesktopEnabled",
"DisableParallelApexTesting"
]
}
}
}
19 changes: 9 additions & 10 deletions orgs/release.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{
"Company": "Affiliations - Release Test Org",
"Country": "US",
"LastName": "Belvedere",
"Email": "[email protected]",
"Edition": "Developer",
"OrgPreferences" : {
"DisableParallelApexTesting" : true,
"S1DesktopEnabled" : true,
"ChatterEnabled" : true
"edition": "Developer",
"orgName": "Affiliations - Release Test Org",
"orgPreferences": {
"enabled": [
"ChatterEnabled",
"S1DesktopEnabled",
"DisableParallelApexTesting"
]
}
}
}
10 changes: 10 additions & 0 deletions sfdx-project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"packageDirectories": [
{
"path": "src",
"default": true
}
],
"namespace": "",
"sourceApiVersion": "36.0"
}
10 changes: 0 additions & 10 deletions sfdx-workspace.json

This file was deleted.

6 changes: 0 additions & 6 deletions workspace-config.json

This file was deleted.

0 comments on commit e6d8647

Please sign in to comment.