Skip to content

Commit

Permalink
Merge pull request #41 from apex-dev-tools/40-change-package-names-to…
Browse files Browse the repository at this point in the history
…-reflect-move-to-apex-dev-tools

Update JVM packages to io.github.apexdevtools.apexparser
  • Loading branch information
pwrightcertinia authored Apr 4, 2024
2 parents 987fb2e + 7cdf460 commit 2f9160c
Show file tree
Hide file tree
Showing 14 changed files with 23 additions and 25 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# apex-parser - Changelog

## 4.0.0 - 2023-03-01
## 4.0.0 - 2023-03-28

- Correct trigger body parsing to allow member declarations
- Add support for TYPEOF in SOQL subqueries
- Change com.nawforce.apexparser packages to io.github.apexdevtools.apexparser

## 3.6.0 - 2024-02-15

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package com.nawforce.apexparser;
package io.github.apexdevtools.apexparser;

import org.antlr.v4.runtime.CharStream;
import org.antlr.v4.runtime.CharStreams;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Copyright (c) 2022 FinancialForce.com, inc. All rights reserved.
*/
package com.nawforce.apexparser;
package io.github.apexdevtools.apexparser;

import org.antlr.v4.runtime.*;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
3. The name of the author may not be used to endorse or promote products
derived from this software without specific prior written permission.
*/
package com.nawforce.apexparser;
package io.github.apexdevtools.apexparser;

import org.antlr.v4.runtime.CharStreams;
import org.antlr.v4.runtime.CommonTokenStream;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
3. The name of the author may not be used to endorse or promote products
derived from this software without specific prior written permission.
*/
package com.nawforce.apexparser;
package io.github.apexdevtools.apexparser;

import org.antlr.v4.runtime.CharStreams;
import org.antlr.v4.runtime.CommonTokenStream;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
3. The name of the author may not be used to endorse or promote products
derived from this software without specific prior written permission.
*/
package com.nawforce.apexparser;
package io.github.apexdevtools.apexparser;

import org.junit.jupiter.api.Test;

import java.util.List;
import java.util.Map;

import static com.nawforce.apexparser.SyntaxErrorCounter.createParser;
import static io.github.apexdevtools.apexparser.SyntaxErrorCounter.createParser;
import static org.junit.jupiter.api.Assertions.*;

public class ApexParserTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
3. The name of the author may not be used to endorse or promote products
derived from this software without specific prior written permission.
*/
package com.nawforce.apexparser;
package io.github.apexdevtools.apexparser;

import org.junit.jupiter.api.Test;

import java.util.Map;

import static com.nawforce.apexparser.SyntaxErrorCounter.createParser;
import static io.github.apexdevtools.apexparser.SyntaxErrorCounter.createParser;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
3. The name of the author may not be used to endorse or promote products
derived from this software without specific prior written permission.
*/
package com.nawforce.apexparser;
package io.github.apexdevtools.apexparser;

import org.antlr.v4.runtime.CharStreams;
import org.antlr.v4.runtime.CommonTokenStream;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
3. The name of the author may not be used to endorse or promote products
derived from this software without specific prior written permission.
*/
package com.nawforce.apexparser;
package io.github.apexdevtools.apexparser;

import org.junit.jupiter.api.Test;

import java.util.Map;

import static com.nawforce.apexparser.SyntaxErrorCounter.createParser;
import static io.github.apexdevtools.apexparser.SyntaxErrorCounter.createParser;
import static org.junit.jupiter.api.Assertions.*;

public class SOQLParserTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
3. The name of the author may not be used to endorse or promote products
derived from this software without specific prior written permission.
*/
package com.nawforce.apexparser;
package io.github.apexdevtools.apexparser;

import org.junit.jupiter.api.Test;

import java.util.Map;

import static com.nawforce.apexparser.SyntaxErrorCounter.createParser;
import static io.github.apexdevtools.apexparser.SyntaxErrorCounter.createParser;
import static org.junit.jupiter.api.Assertions.*;

public class SOSLParserTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
3. The name of the author may not be used to endorse or promote products
derived from this software without specific prior written permission.
*/
package com.nawforce.apexparser;
package io.github.apexdevtools.apexparser;

import org.antlr.v4.runtime.*;

Expand Down
2 changes: 1 addition & 1 deletion npm/src/__tests__/system/SampleParseSys.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ describe("Parse samples", () => {
[
"-cp",
"jvm/target/dependency/*:jvm/target/apex-parser.jar",
"com.nawforce.apexparser.Check",
"io.github.apexdevtools.apexparser.Check",
resolve(path, r.path)
],
{
Expand Down
15 changes: 6 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,18 @@
"name": "apex-parser-init",
"private": true,
"version": "0.0.1",
"homepage": "https://github.com/nawforce/apex-parser",
"repository": "nawforce/apex-parser",
"homepage": "https://github.com/apex-dev-tools/apex-parser",
"repository": "apex-dev-tools/apex-parser",
"scripts": {
"build": "npm run build-npm && npm run build-jvm",
"build-npm": "npm run init-npm && cd npm && npm run build && npm run test && cd ..",
"build-jvm": "npm run init-jvm && cd jvm && mvn package && cd ..",
"init-npm": "cp antlr/* npm/antlr && (cd npm; npm ci)",
"init-jvm": "cp antlr/* jvm/src/main/antlr4/com/nawforce/apexparser"
},
"files": [
],
"dependencies": {
},
"devDependencies": {
"init-jvm": "cp antlr/* jvm/src/main/antlr4/io/github/apexdevtools/apexparser"
},
"files": [],
"dependencies": {},
"devDependencies": {},
"engines": {
"node": ">=8.0.0"
}
Expand Down

0 comments on commit 2f9160c

Please sign in to comment.