Revert "Move typescript and java projects into different directories"

This reverts commit 7ee221ed38.

.github/workflows/build.yml

@@ -8,7 +8,6 @@ on:
 
 jobs:
   analyse:
-    name: Analyse
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v1
@@ -22,25 +21,26 @@ jobs:
           java-version: '8'
           architecture: x64
       - name: Install Node Packages
-        run: npm ci --prefix extension
+        run: npm ci
       - name: Lint Files
-        run: npm run lint --prefix extension
+        run: npm run lint
       - name: Build Java
         uses: eskatos/gradle-command-action@v1
         with:
           arguments: build
           build-root-directory: java-gradle-tasks
           wrapper-directory: java-gradle-tasks
+        if: github.ref != 'master'
       - name: SonarQube Analyse
         uses: sonarsource/sonarcloud-github-action@master
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_SONARCLOUD_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
           JAVA_HOME: ''
+        if: github.ref != 'master'
 
   build-jar-artifacts:
     needs: [analyse]
-    name: Build Jar Artifacts
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v1
@@ -63,7 +63,6 @@ jobs:
 
   test-extension:
     needs: [build-jar-artifacts]
-    name: "Test Java ${{ matrix.java-version }} - Node ${{ matrix.node-version }} - OS ${{ matrix.os }}"
     runs-on: ${{ matrix.os }}
 
     strategy:
@@ -74,6 +73,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v1
+      - name: Download lib
+        uses: actions/download-artifact@v1
+        with:
+          name: lib
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v1
         with:
@@ -83,39 +86,29 @@ jobs:
         with:
           java-version: ${{ matrix.java-version }}
           architecture: x64
-      - name: Download lib
-        uses: actions/download-artifact@v1
-        with:
-          name: lib
-      - name: Move lib to extension
-        run: mv lib extension/
       - name: Start Xvfb
         run: |
           Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
         if: matrix.os == 'ubuntu-latest'
       - name: Set perms
         run: |
-          chmod +x extension/lib/gradle-tasks
+          chmod +x lib/gradle-tasks
           unset npm_config_prefix
         if: matrix.os != 'windows-latest'
       - name: Build & test extension on ${{ matrix.os }}
         run: |
-          npm ci --prefix extension
-          npm test --prefix extension
+          npm ci
+          npm test
         env:
           DISPLAY: ':99.0'
           CI: 'true'
 
   publish-extension:
     needs: [test-extension]
-    name: Publish extension
     if: github.event_name == 'release' && github.event.action == 'published'
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v1
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 12.x
       - name: Download lib
         uses: actions/download-artifact@v1
         with:
@@ -127,6 +120,11 @@ jobs:
       - name: Package extension
         run: |
           cd extension
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12.x
+      - name: Package extension
+        run: |
           chmod +x lib/gradle-tasks
           tag=${GITHUB_REF#refs/tags/}
           echo "Setting package version $tag"

.gitignore

@@ -1,3 +1,11 @@
-.scannerwork
+out
+node_modules
+*.vsix
+.vscode-test
 .DS_Store
 .envrc
+lib/**
+.classpath
+.settings
+.idea
+.scannerwork

extension/.gitignore

@@ -1,10 +0,0 @@
-out
-node_modules
-*.vsix
-.vscode-test
-.DS_Store
-.envrc
-lib/**
-.classpath
-.settings
-.idea

java-gradle-tasks/.gitignore

@@ -7,4 +7,3 @@ build
 bin
 .classpath
 .settings
-.envrc

package.json

@@ -273,7 +273,8 @@
     "lint:prettier": "prettier --check \"**/*.{ts,js,json,svg,md,yml}\"",
     "lint:eslint": "eslint . --ext .js,.ts",
     "format": "npm run format:prettier && npm run lint:eslint -- --fix",
-    "format:prettier": "prettier --write '**/*.{json,svg,md,yml}'"
+    "format:prettier": "prettier --write '**/*.{json,svg,md,yml}'",
+    "compile:java": "cd java-gradle-tasks && ./gradlew build copyLibToParent"
   },
   "dependencies": {},
   "devDependencies": {

sonar-project.properties

@@ -5,7 +5,7 @@ sonar.modules=typescript-module,java-module
 
 typescript-module.sonar.projectName=Typescript Extension
 typescript-module.sonar.language=typescript
-typescript-module.sonar.sources=extension/src
+typescript-module.sonar.sources=src
 typescript-module.sonar.projectBaseDir=.
 typescript-module.sonar.exclusions=java-gradle-tasks/**