Skip to content

Commit

Permalink
Merge pull request #3 from nylas/fix-package-version
Browse files Browse the repository at this point in the history
Fixed package versioning issue which was breaking build
  • Loading branch information
LincolnRychecky authored Aug 21, 2024
2 parents 093715b + 8f5eb2a commit d2e5865
Show file tree
Hide file tree
Showing 15 changed files with 20 additions and 11 deletions.
Binary file modified .sf/orgs/00DE2000007XjYbMAK/localSourceTracking/index
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
x���A
�0@Q�9�\@��&M�]&����4�/�v��?����2�)�F7�>e_x�D���L�"#׌:GJ�ٽ��s@��s�|�C�qR�‚j�,���[ur���ao��vt5]��<op�E�<3�gD�߱a��t#D�
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
x�m�OK�0p���m\��"�؃+�sx��ͺ����)���]�� �s}�?e�B�\^$�3p�5��`�h�Ø�`%��GT����@ƻK��� �n��m�(��·81q q�,�����c���޵ga%E|���np: G�fW��z�-�!j8���8OX�+kj�V�L_ ��e45v�I�*�Zl�u��Z~�o/����b!RQ���f?��^�
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
74e99834d65f773c01b2a0cecfe9bf5a4b1ef7fd
3a80a5301a14101d4792bb42179edec0685ebdf2
12 changes: 9 additions & 3 deletions .sf/orgs/00DE2000007XjYbMAK/maxRevision.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"serverMaxRevisionCounter": 978,
"serverMaxRevisionCounter": 984,
"sourceMembers": {
"Profile__Admin": {
"serverRevisionCounter": 627,
Expand Down Expand Up @@ -200,8 +200,8 @@
"isNameObsolete": false
},
"ApexClass__NylasHTTPUtility": {
"serverRevisionCounter": 510,
"lastRetrievedFromServer": 510,
"serverRevisionCounter": 983,
"lastRetrievedFromServer": 983,
"memberType": "ApexClass",
"isNameObsolete": false
},
Expand Down Expand Up @@ -330,6 +330,12 @@
"lastRetrievedFromServer": 973,
"memberType": "ApexClass",
"isNameObsolete": false
},
"ApexClass__NylasVersion": {
"serverRevisionCounter": 984,
"lastRetrievedFromServer": 984,
"memberType": "ApexClass",
"isNameObsolete": false
}
}
}
8 changes: 4 additions & 4 deletions force-app/main/default/classes/NylasHTTPUtility.cls
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ public class NylasHTTPUtility {

// the base url for the Nylas API ('https://api.us.nylas.com' or 'https://api.eu.nylas.com')
private static String baseURL = nylasSettings.Region__c == 'US' ||
nylasSettings.Region__c == null
? 'https://api.us.nylas.com'
: 'https://api.eu.nylas.com';
nylasSettings.Region__c == null
? 'https://api.us.nylas.com'
: 'https://api.eu.nylas.com';

private static String nylasAPISecret = nylasSettings.Nylas_API_Secret__c;

Expand All @@ -24,7 +24,7 @@ public class NylasHTTPUtility {
public static HttpRequest newRequest(HttpMethod method, String url) {
// Define the endpoint URL
String endpointUrl = baseURL + url;
String versionNumber = PackageVersion.VERSION_NUMBER;
String versionNumber = NylasVersion.VERSION_NUMBER;

// Make post request to the endpoint
HttpRequest req = new HttpRequest();
Expand Down
4 changes: 2 additions & 2 deletions force-app/main/default/classes/config/NylasVersion.cls
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/**
* @description : Nylas Apex SDK Version, generated by scripts/js/exportVersion.js.
* @author : exportVersion.js
* @author : John Jung
* @last modified on : 2024-08-21
* @last modified by : exportVersion.js
**/
public class PackageVersion {
public class NylasVersion {
public static final String VERSION_NUMBER = '0.1.0.NEXT';
}
2 changes: 1 addition & 1 deletion scripts/js/exportVersion.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const comment = `/**
* @last modified by : exportVersion.js
**/
`;
const classStr = `public class PackageVersion {
const classStr = `public class NylasVersion {
public static final String VERSION_NUMBER = '${version}';
}\n`;
const output = comment + classStr;
Expand Down

0 comments on commit d2e5865

Please sign in to comment.