Merge pull request #38 from MGross21/fix/dependencies

Modernize Build System and Improve CI Workflows

Author: MGross21

.github/dependabot.yml

@@ -7,6 +7,11 @@ updates:
       interval: "daily"
     labels:
       - "dependencies"
+    ignore:
+      - dependency-name: "gradle"
+        update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
+      - dependency-name: "org.jlleitschuh.gradle.ktlint"
+        update-types: ["version-update:semver-minor", "version-update:semver-patch"]
     groups:
       # Group PR for all FTC SDK dependencies
       ftc-sdk:

.github/workflows/ktlint.yml

@@ -19,32 +19,32 @@ jobs:
         ref: ${{ github.event.pull_request.head.ref || github.ref }}
         token: ${{ secrets.GITHUB_TOKEN }}
 
-    - uses: actions/setup-java@v5
-      with:
-        java-version: '17'
-        distribution: 'temurin'
-    
-    - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@v5
-    
-    - name: Make gradlew executable
-      run: chmod +x ./gradlew
+      - uses: actions/setup-java@v5
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+      
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
+      
+      - name: Make gradlew executable
+        run: chmod +x ./gradlew
 
-    - name: Format (non-fork) or check (fork)
-      run: |
-        if [[ "${{ github.event.pull_request.head.repo.full_name }}" != "${{ github.repository }}" && "${{ github.event_name }}" == "pull_request" ]]; then
-          ./gradlew ktlintCheck --no-daemon
-        else
-          ./gradlew ktlintFormat --no-daemon
-        fi
+      - name: Run ktlint
+        run: |
+          if [[ "${{ github.event_name }}" == "push" || "${{ github.event.pull_request.head.repo.full_name }}" != "${{ github.repository }}" ]]; then
+            ./gradlew ktlintCheck --no-daemon
+          else
+            ./gradlew ktlintFormat --no-daemon
+          fi
       
-    - name: Commit formatting changes
-      if: github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'push'
-      run: |
-        if [[ -n $(git status --porcelain) ]]; then
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-          git config user.name "github-actions[bot]"
-          git add .
-          git commit -m "style: apply ktlint formatting [bot]"
-          git push
-        fi
+      - name: Commit formatting changes
+        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
+        run: |
+          if [[ -n $(git status --porcelain) ]]; then
+            git config user.email "github-actions[bot]@users.noreply.github.com"
+            git config user.name "github-actions[bot]"
+            git add .
+            git commit -m "style: apply ktlint formatting [bot]"
+            git push
+          fi

.gitignore

@@ -85,4 +85,7 @@ lint/tmp/
 # lint/reports/
 
 # Others
-.venv
+.venv
+
+# Kotlin compiler temp files
+.kotlin/

README.md

@@ -8,26 +8,13 @@ For detailed information, refer to the [FTC Robot Controller repository README](
 
 For official Java documentation, visit the [FTC JavaDocs](https://javadoc.io/doc/org.firstinspires.ftc).
 
-## Keeping the Repository Updated
+## Keeping Repository Updated
 
-To stay aligned with the upstream FTC repository:
+@Dependabot will open PR's if any updates are posted.
 
-1. Add the upstream repository:
-  ```bash
-  git remote add upstream https://github.com/FIRST-Tech-Challenge/FtcRobotController
-  ```
+## Adding New Dependencies
 
-2. Fetch the latest updates:
-  ```bash
-  git fetch upstream
-  ```
-
-3. Merge the updates:
-  ```bash
-  git merge upstream/master
-  ```
-
-4. Address any merge conflicts as necessary.
+See [`gradle/libs.versions.toml`](gradle/libs.versions.toml)
 
 ## Formatting Kotlin Code
 

TeamCode/build.gradle

@@ -0,0 +1,64 @@
+//
+// build.gradle in TeamCode
+//
+// Most of the definitions for building your module reside in a common, shared
+// file 'build.common.gradle'. Being factored in this way makes it easier to
+// integrate updates to the FTC into your code. If you really need to customize
+// the build definitions, you can place those customizations in this file, but
+// please think carefully as to whether such customizations are really necessary
+// before doing so.
+
+
+// Custom definitions may go here
+
+// ktlint configuration - plugins block must come before apply statements
+plugins {
+    id("com.android.application")
+    id("org.jlleitschuh.gradle.ktlint") version "13.1.0"
+    id("org.jetbrains.kotlin.android")
+}
+
+// Include common definitions from above.
+apply { from("../build.common.gradle") }
+
+ktlint {
+    android = true
+    ignoreFailures = true  // Allow build to succeed, but still show warnings
+    
+    // Disable ktlint check tasks to prevent build failures
+    filter {
+        exclude("**/build/**")
+    }
+}
+
+android {
+    namespace = "pioneer"
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
+    packagingOptions {
+        jniLibs {
+            useLegacyPackaging = true
+        }
+    }
+}
+
+dependencies {
+    implementation(project(":FtcRobotController"))
+    implementation(libs.ftc.inspection)
+    implementation(libs.ftc.blocks)
+    implementation(libs.ftc.robotcore)
+    implementation(libs.ftc.robotserver)
+    implementation(libs.ftc.onbotjava)
+    implementation(libs.ftc.hardware)
+    implementation(libs.ftc.common)
+    implementation(libs.ftc.vision)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.acmerobotics.dashboard)
+    testImplementation(libs.junit)
+}
+
+//kotlin {
+//    jvmToolchain(8)
+//}

TeamCode/build.gradle.kts

@@ -5,6 +5,7 @@ import com.qualcomm.robotcore.eventloop.opmode.TeleOp
 import pioneer.Bot
 import pioneer.decode.Obelisk
 import pioneer.general.AllianceColor
+import pioneer.hardware.Camera
 import pioneer.opmodes.BaseOpMode
 import pioneer.vision.AprilTag
 

TeamCode/src/main/kotlin/pioneer/opmodes/other/ObeliskTest.kt

@@ -5,15 +5,15 @@
  */
 
 buildscript {
-    ext.kotlin_version = '2.2.21'
+    val kotlin_version = "2.2.21"
     repositories {
         mavenCentral()
         google()
     }
     dependencies {
         // Note for FTC Teams: Do not modify this yourself.
-        classpath 'com.android.tools.build:gradle:8.7.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath("com.android.tools.build:gradle:8.7.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
     }
 }
 
@@ -23,7 +23,7 @@ allprojects {
     repositories {
         mavenCentral()
         google()
-        maven { url = 'https://maven.brott.dev/' }
+        maven { url = uri("https://maven.brott.dev/") }
     }
 }
 

build.gradle build.gradle.ktsbuild.gradle renamed to build.gradle.kts

@@ -0,0 +1,2 @@
+include(":FtcRobotController")
+include(":TeamCode")