diff --git a/.github/workflows/bump_version.yml b/.github/workflows/bump_version.yml index d4910e78..8daac97c 100644 --- a/.github/workflows/bump_version.yml +++ b/.github/workflows/bump_version.yml @@ -20,7 +20,7 @@ jobs: - name: Set new version id: set_version run: | - perl -i -pe 's/^(version:\s+\d+\.\d+\.\d+\+)(\d+)$/"version: ${{ github.event.inputs.newVersion }}+".($2+1)/e' ./.template/pubspec.yaml + perl -i -pe 's/^(version:\s+\d+\.\d+\.\d+\+)(\d+)$/"version: ${{ github.event.inputs.newVersion }}+".($2+1)/e' ./template/pubspec.yaml - name: Create Pull Request uses: peter-evans/create-pull-request@v4 with: diff --git a/Makefile b/Makefile index e8776343..8be629b6 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ PYTHON3 := $(shell command -v python3 2> /dev/null) VENV_ACTIVATE=$(VENV_NAME)/bin/activate PYTHON=$(VENV_NAME)/bin/python3 -PROJECT_PATH=$(PWD)/.template +PROJECT_PATH=$(PWD)/template PACKAGE_NAME= PROJECT_NAME= APP_NAME= diff --git a/scripts/setup.py b/scripts/setup.py index b74eb8b0..d367bf37 100644 --- a/scripts/setup.py +++ b/scripts/setup.py @@ -439,7 +439,7 @@ def clean_up(files): # Remove the `.github` folder to avoid redundant workflow clean_up(['.github']) move_project_to_root(project) - clean_up(['.template', 'LICENSE', 'Makefile']) + clean_up(['template', 'LICENSE', 'Makefile']) print("=> 🚀 Done! Project is ready for the next development 🙌") except: print("❌ There is something wrong! Please try again.") diff --git a/scripts/test.py b/scripts/test.py index aa42eedf..988f908d 100644 --- a/scripts/test.py +++ b/scripts/test.py @@ -7,7 +7,7 @@ from setup import Android, Project, Ios, Flutter # After creating a new project, the new project will be created in the current directory. -expected_project_path = os.environ.get("PROJECT_PATH").replace("/.template", "") if os.environ.get("RUNNING_TEST_MODE") == "0" else os.environ.get("PROJECT_PATH") +expected_project_path = os.environ.get("PROJECT_PATH").replace("/template", "") if os.environ.get("RUNNING_TEST_MODE") == "0" else os.environ.get("PROJECT_PATH") expected_package_name = os.environ.get("PACKAGE_NAME") if bool(os.environ.get("PACKAGE_NAME")) else "co.nimblehq.flutter.template" expected_app_name = os.environ.get("APP_NAME") if bool(os.environ.get("APP_NAME")) else "Flutter Templates" expected_project_name = os.environ.get("PROJECT_NAME") if bool(os.environ.get("PROJECT_NAME")) else "flutter_templates" diff --git a/.template/.env.sample b/template/.env.sample similarity index 100% rename from .template/.env.sample rename to template/.env.sample diff --git a/.template/.github/CODEOWNERS b/template/.github/CODEOWNERS similarity index 100% rename from .template/.github/CODEOWNERS rename to template/.github/CODEOWNERS diff --git a/.template/.github/ISSUE_TEMPLATE/bug_template.md b/template/.github/ISSUE_TEMPLATE/bug_template.md similarity index 100% rename from .template/.github/ISSUE_TEMPLATE/bug_template.md rename to template/.github/ISSUE_TEMPLATE/bug_template.md diff --git a/.template/.github/ISSUE_TEMPLATE/chore_template.md b/template/.github/ISSUE_TEMPLATE/chore_template.md similarity index 100% rename from .template/.github/ISSUE_TEMPLATE/chore_template.md rename to template/.github/ISSUE_TEMPLATE/chore_template.md diff --git a/.template/.github/ISSUE_TEMPLATE/feature_template.md b/template/.github/ISSUE_TEMPLATE/feature_template.md similarity index 100% rename from .template/.github/ISSUE_TEMPLATE/feature_template.md rename to template/.github/ISSUE_TEMPLATE/feature_template.md diff --git a/.template/.github/ISSUE_TEMPLATE/story_template.md b/template/.github/ISSUE_TEMPLATE/story_template.md similarity index 100% rename from .template/.github/ISSUE_TEMPLATE/story_template.md rename to template/.github/ISSUE_TEMPLATE/story_template.md diff --git a/.template/.github/PULL_REQUEST_TEMPLATE.md b/template/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from .template/.github/PULL_REQUEST_TEMPLATE.md rename to template/.github/PULL_REQUEST_TEMPLATE.md diff --git a/.template/.github/PULL_REQUEST_TEMPLATE/release_template.md b/template/.github/PULL_REQUEST_TEMPLATE/release_template.md similarity index 100% rename from .template/.github/PULL_REQUEST_TEMPLATE/release_template.md rename to template/.github/PULL_REQUEST_TEMPLATE/release_template.md diff --git a/.template/.github/workflows/ios_deploy_to_app_store.yml b/template/.github/workflows/ios_deploy_to_app_store.yml similarity index 97% rename from .template/.github/workflows/ios_deploy_to_app_store.yml rename to template/.github/workflows/ios_deploy_to_app_store.yml index 2705d78b..f7eb19e6 100644 --- a/.template/.github/workflows/ios_deploy_to_app_store.yml +++ b/template/.github/workflows/ios_deploy_to_app_store.yml @@ -11,7 +11,7 @@ jobs: runs-on: macOS-latest defaults: run: - working-directory: .template + working-directory: template env: TEAM_ID: ${{ secrets.TEAM_ID }} FASTLANE_USER: ${{ secrets.FASTLANE_USER }} diff --git a/.template/.github/workflows/ios_deploy_to_testflight.yml b/template/.github/workflows/ios_deploy_to_testflight.yml similarity index 100% rename from .template/.github/workflows/ios_deploy_to_testflight.yml rename to template/.github/workflows/ios_deploy_to_testflight.yml diff --git a/.template/.github/workflows/test.yml b/template/.github/workflows/test.yml similarity index 100% rename from .template/.github/workflows/test.yml rename to template/.github/workflows/test.yml diff --git a/.template/.gitignore b/template/.gitignore similarity index 100% rename from .template/.gitignore rename to template/.gitignore diff --git a/.template/.metadata b/template/.metadata similarity index 100% rename from .template/.metadata rename to template/.metadata diff --git a/.template/README.md b/template/README.md similarity index 98% rename from .template/README.md rename to template/README.md index 306c7277..2bf05b6f 100644 --- a/.template/README.md +++ b/template/README.md @@ -42,7 +42,7 @@ Clone the repository - Run unit testing: - - `$ fvm flutter test .` + - `$ fvm flutter test` - Run integration testing: diff --git a/.template/analysis_options.yaml b/template/analysis_options.yaml similarity index 97% rename from .template/analysis_options.yaml rename to template/analysis_options.yaml index e8856d81..8ae8663b 100644 --- a/.template/analysis_options.yaml +++ b/template/analysis_options.yaml @@ -31,6 +31,8 @@ linter: analyzer: exclude: [ lib/**.g.dart, + lib/**.gen.dart, + lib/**.config.dart, lib/**.freezed.dart, test/**.mocks.dart ] diff --git a/.template/android/.gitignore b/template/android/.gitignore similarity index 100% rename from .template/android/.gitignore rename to template/android/.gitignore diff --git a/.template/android/app/build.gradle b/template/android/app/build.gradle similarity index 100% rename from .template/android/app/build.gradle rename to template/android/app/build.gradle diff --git a/.template/android/app/src/debug/AndroidManifest.xml b/template/android/app/src/debug/AndroidManifest.xml similarity index 100% rename from .template/android/app/src/debug/AndroidManifest.xml rename to template/android/app/src/debug/AndroidManifest.xml diff --git a/.template/android/app/src/main/AndroidManifest.xml b/template/android/app/src/main/AndroidManifest.xml similarity index 98% rename from .template/android/app/src/main/AndroidManifest.xml rename to template/android/app/src/main/AndroidManifest.xml index 644e37af..e2811472 100644 --- a/.template/android/app/src/main/AndroidManifest.xml +++ b/template/android/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ =2.17.5 <3.0.0" diff --git a/.template/test/api/repository/credential_repository_test.dart b/template/test/api/repository/credential_repository_test.dart similarity index 100% rename from .template/test/api/repository/credential_repository_test.dart rename to template/test/api/repository/credential_repository_test.dart diff --git a/.template/test/mocks/generate_mocks.dart b/template/test/mocks/generate_mocks.dart similarity index 100% rename from .template/test/mocks/generate_mocks.dart rename to template/test/mocks/generate_mocks.dart diff --git a/.template/test_driver/integration_test.dart b/template/test_driver/integration_test.dart similarity index 100% rename from .template/test_driver/integration_test.dart rename to template/test_driver/integration_test.dart