Release v2.0.0

.gitattributes

@@ -1 +1 @@
-*.sh text eol=lf
+* text eol=lf

.github/workflows/ci.yml

@@ -1,111 +1,100 @@
-name: CI
+name: Rush CI
 
 on:
-  workflow_dispatch:
   push:
-    branches: [main, dev]
   pull_request:
-    branches: [main, dev]
+  workflow_dispatch: # This let's us trigger the workflow manually from GitHub.
 
 jobs:
-  build:
+  annotation-processor:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v3
+        with:
+          distribution: zulu
+          java-version: 8
+      - uses: gradle/gradle-build-action@v2
+        with:
+          gradle-version: 8.3
+          build-root-directory: processor
+      - name: Execute build
+        working-directory: processor
+        run: |
+          chmod +x ./gradlew
+          ./gradlew build
+
+  cli:
     strategy:
-      fail-fast: true
       matrix:
         include:
-          - os: windows-latest
-            os_short: win
-          - os: macos-latest
-            os_short: macos
-          - os: ubuntu-latest
-            os_short: linux
-
+          - os: ubuntu-22.04
+            target: x86_64-linux
+          - os: macos-12
+            target: x86_64-apple-darwin
+          - os: windows-2022
+            target: x86_64-windows
     runs-on: ${{ matrix.os }}
-
     steps:
-      - uses: actions/checkout@v2
-      - uses: dart-lang/setup-dart@v1
-
-      - name: Get deps
+      - uses: actions/checkout@v4
+      - uses: dart-lang/setup-dart@v1.5.1
+      - name: Install dependencies
         run: dart pub get
-
-      - name: Build the executable
+      - name: Verify formatting
+        if: ${{ github.event_name == 'pull_request' }}
+        run: dart format -o none --set-exit-if-changed .
+      - name: Run build_runner
+        run: dart run build_runner build --delete-conflicting-outputs
+      - name: Analyze source
+        if: ${{ github.event_name == 'pull_request' }}
+        run: dart analyze
+      - name: Build executable
         shell: bash
         run: |
-          chmod +x ./scripts/build.sh
-          ./scripts/build.sh -v 1.2.1
-
+          mkdir build
+          if [ "$OS" = "Windows_NT" ]; then
+            dart compile exe -o build/rush.exe bin/rush.dart
+          else
+            dart compile exe -o build/rush bin/rush.dart
+          fi
       - name: Upload executable
-        if: ${{ github.ref != 'refs/heads/main' }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
-          name: rush-${{ matrix.os_short }}
-          path: ./build/bin/*
-
-      - name: Get jq
-        if: ${{ github.ref == 'refs/heads/main' && github.event_name == 'push' }}
-        shell: bash
-        run: |
-          if [[ "$OSTYPE" == "linux-gnu"* ]]; then sudo apt-get install jq; fi
-          if [[ "$OSTYPE" == "darwin"* ]]; then brew install jq; fi
-          if [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]]; then choco install jq; fi
-
-      - name: Upload exe to pack repo
-        if: ${{ github.ref == 'refs/heads/main' && github.event_name == 'push' }}
-        shell: bash
-        run: |
-          chmod +x ./scripts/upload_exe.sh
-          ./scripts/upload_exe.sh ${{ secrets.GH_PAT }}
-
-  release:
-    needs: [build]
-    if: ${{ github.ref == 'refs/heads/main' && github.event_name == 'push' }}
-
-    strategy:
-      fail-fast: true
-      matrix:
-        include:
-          - os: windows-latest
-            os_short: win
-          - os: macos-latest
-            os_short: mac
-          - os: ubuntu-latest
-            os_short: linux
-
-    runs-on: ubuntu-latest
-
-    env:
-      BASE_DIR: build/${{ matrix.os_short }}
-
+          if-no-files-found: error
+          name: rush-${{ matrix.target }}
+          path: build/*
+
+  create-release:
+    if: ${{ github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}
+    needs: [cli, annotation-processor]
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
-
-      - name: Download pack repo
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4.1.7
+      - name: Download JAR dependencies
         run: |
-          mkdir build
-          curl -#Lo build/pack.zip -u "shreyashsaitwal:${{ secrets.GH_PAT }}" https://github.com/shreyashsaitwal/pack/archive/refs/heads/main.zip
-          unzip -o build/pack.zip -d build
-          rm build/pack.zip
-
-      - name: Add files to base directory
-        env:
-          PACK_DIR: build/pack-main
+          mkdir libs && cd libs
+          wget https://github.com/mit-cml/appinventor-sources/raw/master/appinventor/lib/kawa/kawa-1.11-modified.jar
+          wget https://github.com/mit-cml/appinventor-sources/raw/master/appinventor/lib/physicaloid/physicaloid-library.jar
+          wget https://dl.google.com/android/repository/platform-33_r02.zip && unzip platform-33_r02.zip 
+          cp android-13/android.jar android-33.jar
+          rm -r android-13 platform-33_r02.zip
+      - name: Create platform archives
         run: |
-          mkdir -p $BASE_DIR/exe
-          cp -R $PACK_DIR/exe/${{ matrix.os_short }} $BASE_DIR/exe
-          cp -R $PACK_DIR/dev-deps $BASE_DIR
-          cp -R $PACK_DIR/tools $BASE_DIR
-
-      - name: Create ZIP
-        run: |
-          cd $BASE_DIR
-          zip -r rush-${{ matrix.os_short }}.zip *
-
-      - name: Release
+          mkdir archives
+          for VAR in x86_64-linux x86_64-windows x86_64-apple-darwin
+          do
+            # Move the executable to bin dir
+            mkdir rush-$VAR/bin && mv rush-$VAR/rush* rush-$VAR/bin
+            # Copy JARs downloaded in prev step
+            cp libs/ rush-$VAR -r
+            # Create ZIP
+            cd rush-$VAR && zip ../archives/rush-$VAR.zip . -r9
+            cd ..
+          done
+      - name: Create a new draft release
         uses: softprops/action-gh-release@v1
         with:
           draft: true
-          tag_name: draft
-          files: ${{ env.BASE_DIR }}/rush-${{ matrix.os_short }}.zip
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          fail_on_unmatched_files: true
+          files: archives/*.zip

.gitignore

@@ -1,17 +1,21 @@
+# Files and directories created by IntelliJ IDEA
+/.idea
+*.iml
+/.vscode
+
 # Files and directories created by pub
 .dart_tool/
 .packages
-.idea
 pubspec.lock
 
 # Conventional directory for build outputs
-build/
+/build/
 
 # Directory created by dartdoc
-doc/api/
+/doc/api/
 
-misc/
-temp/
+/misc/
+/temp/
 
-*.iml
-env.dart
+*.g.dart
+/scratch.dart

README.md

@@ -1,15 +1,53 @@
-![Banner](assets/banner.png)
+# ⚡ Rush
+**Rush** is a modern extension builder for MIT App Inventor 2.
 
-![dart action](https://github.com/ShreyashSaitwal/rush-cli/actions/workflows/ci.yml/badge.svg) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
+> **Note**: This readme is for an unreleased version of Rush. Head over to [main](https://github.com/shreyashsaitwal/rush-cli/tree/main) for current stable version.
 
-Rush is a new, and probably, improved way of building App Inventor 2 extensions. It is a build tool, which aims to improve the developer experience by reducing the boilerplate code and making extension development feel more like Android development.
+## Features
+* Faster builds
+* Maven like dependency management
+* Kotlin language support
+* Support for AndroidManifest.xml
 
-Check out the [wiki section](https://github.com/ShreyashSaitwal/rush-cli/wiki) for a detailed overview and getting started with Rush.
+## Installation
+> **Note**: Before installing Rush, make sure that you have JDK 8 or above installed.
 
-## Building from sources
-1. Install [Dart SDK](https://dart.dev/get-dart).
-2. Clone this repo: `git clone https://github.com/shreyashsaitwal/rush-cli`.
-3. `cd` into the repo's base directory.
-4. Run `dart pub get`.
-5. Run the build script: `./scripts/build.sh -v VER_NAME`.
-6. The generated executable can be found in `./build` directory.
+### Windows
+In PowerShell, run:
+```ps1
+iwr https://raw.githubusercontent.com/shreyashsaitwal/rush-cli/main/scripts/install/install.ps1 -useb | iex
+```
+
+### Linux and macOS
+1. In the terminal, run:
+
+    ```sh
+    curl https://raw.githubusercontent.com/shreyashsaitwal/rush-cli/main/scripts/install/install.sh -fsSL | sh
+    ```
+
+2. Add `$HOME/.rush/bin` to the `PATH` environment variable.
+
+## Quick start
+Now, that you've installed Rush, let's create a simple extension.
+
+1. Open the terminal in the directory where you want to create your extension project.
+
+2. Run `rush create <NAME_OF_THE_EXTENSION>`.
+This will show you some prompts.
+    - `Package name`: This is the package name in which your extension class will be placed.
+    - `Language`: The language in which you wish to write your extension. 
+    This is just for the sake of sample code generation, you can later manually change the language as per your desire or even use both languages together.
+    - `IDE`: Your favorite IDE or text editor.
+    This is required to generate the file required by these IDEs to support features like code completion and syntax highlighting.
+    You can of course use any other text editor as well, but it's very unlikely that it would work well with Rush projects even if it supports Java.
+
+3. `cd` into the generated project directory and run `rush build`.
+
+4. That's it, the generated extension file (AIX) can be found in the `out` directory.
+
+## Todo
+- [ ] Core concepts of extension dev
+- [ ] Faq
+- [ ] Contributing
+- [ ] Limitations
+- [ ] List more features

analysis_options.yaml

@@ -2,8 +2,23 @@ include: package:lints/recommended.yaml
 
 analyzer:
   exclude: ['**.g.dart']
-  strong-mode:
-    implicit-casts: false
   language:
     strict-raw-types: true
     strict-inference: true
+
+linter:
+  rules:
+    - always_declare_return_types
+    - avoid_empty_else
+    - avoid_print
+    - avoid_redundant_argument_values
+    - only_throw_errors
+    - prefer_final_fields
+    - prefer_final_in_for_each
+    - prefer_final_locals
+    - prefer_single_quotes
+    - prefer_typing_uninitialized_variables
+    - unawaited_futures
+    - unnecessary_raw_strings
+    - valid_regexps
+    - await_only_futures