Merge pull request #153 from RoboTutorLLC/2024-12-27-fix-dependencies

2024 12 27 fix dependencies

Author: ritessshhh

.github/workflows/build-workflow.yml

@@ -14,7 +14,13 @@ jobs:
     runs-on: 'ubuntu-latest'
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3  # This step checks out the repository so that workflow can access the code.
+
+      - name: Set up JDK 11  # 👈 We are explicitly setting Java version to 11 to ensure compatibility with Gradle 6.5.
+        uses: actions/setup-java@v3  # GitHub-provided action to set up Java.
+        with:
+          distribution: 'temurin'  # We are using the Temurin (Adoptium) distribution.
+          java-version: '11'  # Setting Java to version 11 because Gradle 6.5 does not support Java 17.
 
       - name: Build project
         run: ./gradlew assembleDebug
@@ -44,7 +50,7 @@ jobs:
         run: mv build/robotutor.debug.${{ steps.fetch_version_name.outputs.VERSION_NAME }}.apk build/${{ steps.fetch_apk_name.outputs.APK_NAME }}.apk
 
       - name: Upload APK
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.fetch_apk_name.outputs.APK_NAME }}.apk
-          path: build/${{ steps.fetch_apk_name.outputs.APK_NAME }}.apk
+          path: build/${{ steps.fetch_apk_name.outputs.APK_NAME }}.apk

app/build.gradle

@@ -10,25 +10,23 @@ android {
         targetSdkVersion rootProject.ext.rtTargetSdkVersion
         versionCode rootProject.ext.rtVersionCode
         versionName rootProject.ext.rtVersionName
-        // default is signed by the Android default key
 
+        // Enable multidex support
         multiDexEnabled true
     }
 
     testOptions {
+        // Ensure unit tests return default values for easier testing
         unitTests.returnDefaultValues = true
     }
 
-    // Create a variable called keystorePropertiesFile, and initialize it to your
-    // keystore.properties file, in the sample_config_files folder, inside app/src.
+    // Load keystore properties for signing
     def keystorePropertiesFile = rootProject.file("app/src/sample_config_files/sample_keystore.properties")
-    // Initialize a new Properties() object called keystoreProperties
     def keystoreProperties = new Properties()
-
-    // Load your keystore.properties file into the keystoreProperties object.
     keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
     signingConfigs {
+        // Signing configuration for release builds
         android {
             keyAlias keystoreProperties['keyAlias']
             keyPassword keystoreProperties['keyPassword']
@@ -38,70 +36,77 @@ android {
     }
 
     buildTypes {
-
+        // Configuration for release builds
         release {
             signingConfig signingConfigs.android
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+        // Configuration for debug builds
         debug {
             debuggable true
         }
-
-        // This release includes the DEBUG selector and other various debug support features.
-        //
+        // Custom debug build type with signing
         release_dbg {
             debuggable true
             signingConfig signingConfigs.android
         }
-
     }
 
-    // define apk naming behavior
-    // define apk naming behavior
+    // Define APK naming behavior
     applicationVariants.all { variant ->
         variant.outputs.each { output ->
             def project = "robotutor"
             def SEP = "."
             def buildType = variant.buildType.name
             def version = variant.versionName
 
+            // Set a custom APK name
             def newApkName = project + SEP + buildType + SEP + version + ".apk"
-//            new File(output.outputFile.parent, newApkName)
             output.outputFileName = new File("./../../../../../build/", newApkName)
         }
     }
 
     lintOptions {
-        // set to true to turn off analysis progress reporting by lint
+        // Set to true to turn off analysis progress reporting by lint
         quiet false
-        // if true, stop the gradle build if errors are found
+        // If true, stop the gradle build if errors are found
         abortOnError false
-        // if true, only report errors
+        // If true, only report errors
         ignoreWarnings true
     }
 
+    // Apply checkstyle for code quality checks
     apply from: "checkstyle.gradle"
-    afterEvaluate{
+    afterEvaluate {
         preBuild.dependsOn('checkstyle')
         check.dependsOn 'checkstyle'
     }
-
 }
 
 repositories {
+    google()
     mavenCentral()
+    // Added the custom Maven repository for utilcode
+    maven {
+        url 'http://maven.xdja.com:8081/nexus3/repository/aliyun/'
+    }
 }
 
 dependencies {
+    // Unit testing dependency
     testImplementation 'junit:junit:4.12'
+
+    // Core dependencies
     implementation 'com.writingminds:FFmpegAndroid:0.3.2'
     implementation 'com.google.guava:guava:25.0-android'
     implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation 'androidx.percentlayout:percentlayout:1.0.0'
     implementation 'com.google.code.gson:gson:2.8.7'
     implementation 'org.mp4parser:isoparser:1.9.41'
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
+
+    // Project-specific dependencies
     implementation project(':comp_banner')
     implementation project(':comp_ltkplus')
     implementation project(':util')
@@ -128,12 +133,17 @@ dependencies {
     implementation project(path: ':comp_picmatch')
     implementation project(path: ':comp_bigmath')
     implementation project(path: ':comp_spelling')
-
     implementation project(path: ':comp_intervention')
+
+    // Dependency resolved from custom Maven repository
+    implementation 'com.blankj:utilcode:1.24.4'
+
+    // External libraries
     implementation 'com.github.RoboTutorLLC:ScreenRecordHelper:1.0.0'
     implementation 'com.github.HBiSoft:HBRecorder:2.0.3'
 }
 
+// Task to retrieve version name
 task getVersionName() {
     project.gradle.projectsEvaluated {
         println "$project.android.defaultConfig.versionName"

build.gradle

@@ -6,7 +6,6 @@ buildscript {
         google()
     }
     dependencies {
-
         classpath 'com.android.tools.build:gradle:4.1.3'
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -23,9 +22,15 @@ allprojects {
         google()
     }
 
+    dependencies {
+        modules {
+            module("com.google.android:flexbox") {
+                replacedBy("com.google.android.flexbox:flexbox")
+            }
+        }
+    }
+
     // Global variables common to all modules
-    // see: http://tools.android.com/tech-docs/new-build-system/tips
-    //
     ext {
         rtCompileSdkVersion=29          //Integer
         rtBuildToolsVersion="26.0.1"    //String
@@ -34,23 +39,17 @@ allprojects {
 
         // Note that using target version 22 bypasses the new run-time permissions found
         // in Marshmallow 23
-        //
         rtTargetSdkVersion=22
 
         rtVersionCode=1
 
         // Semantic versioning description:
         // <Milestone release> <Feature Release> <Patch release> <Asset Compatibility INDEX>
-
-
         rtVersionName="3.5.0.1"
         //TODO: move this out of build so we don't have to rebuild to unzip assets
-
     }
 }
 
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
-
-

comp_nd/build.gradle

@@ -34,5 +34,5 @@ dependencies {
     api project (':resources')
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
-    implementation 'com.google.android:flexbox:1.0.0'
+    implementation 'com.google.android.flexbox:flexbox:3.0.0'
 }