Auto stash before merge of "master" and "origin/master"

OpenTails · Nov 9, 2024 · 2b43dc8 · 2b43dc8
1 parent ac78477
commit 2b43dc8
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 38 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -6,24 +6,24 @@ plugins {
 }
 
 def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
+def localPropertiesFile = rootProject.file("local.properties")
 if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
+    localPropertiesFile.withReader("UTF-8") { reader ->
         localProperties.load(reader)
     }
 }
 
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+def flutterVersionCode = localProperties.getProperty("flutter.versionCode")
 if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
+    flutterVersionCode = "1"
 }
 
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
+def flutterVersionName = localProperties.getProperty("flutter.versionName")
 if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
+    flutterVersionName = "1.0"
 }
 def keystoreProperties = new Properties()
-def keystorePropertiesFile = rootProject.file('key.properties')
+def keystorePropertiesFile = rootProject.file("key.properties")
 if (keystorePropertiesFile.exists()) {
     keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 }
@@ -33,17 +33,17 @@ android {
     //ndkVersion flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-        //coreLibraryDesugaringEnabled true
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+        coreLibraryDesugaringEnabled true
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = "1.8"
     }
 
     sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+        main.java.srcDirs += "src/main/kotlin"
     }
 
     defaultConfig {
@@ -67,10 +67,10 @@ android {
     }
     signingConfigs {
         release {
-            keyAlias keystoreProperties['keyAlias']
-            keyPassword keystoreProperties['keyPassword']
-            storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
-            storePassword keystoreProperties['storePassword']
+            keyAlias keystoreProperties["keyAlias"]
+            keyPassword keystoreProperties["keyPassword"]
+            storeFile keystoreProperties["storeFile"] ? file(keystoreProperties["storeFile"]) : null
+            storePassword keystoreProperties["storePassword"]
             // Optional, specify signing versions used
             enableV1Signing true
             enableV2Signing true
@@ -85,11 +85,11 @@ android {
             // so `flutter run --release` works.
             signingConfig keystorePropertiesFile.exists() ? signingConfigs.release : signingConfigs.debug
             ndk {
-                debugSymbolLevel 'full'
+                debugSymbolLevel "full"
             }
-            //proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-            minifyEnabled false
-            shrinkResources false
+            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
+            minifyEnabled true
+            shrinkResources true
         }
         debug {
             // TODO: Add your own signing config for the release build.
@@ -98,19 +98,19 @@ android {
             signingConfig keystorePropertiesFile.exists() ? signingConfigs.release : signingConfigs.debug
         }
     }
-    namespace 'com.codel1417.tailApp'
-    ndkVersion '27.0.12077973'
+    namespace "com.codel1417.tailApp"
+    ndkVersion "27.0.12077973"
 }
 
 flutter {
-    source '../..'
+    source "../.."
 }
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:2.0.21"
-    testImplementation 'junit:junit:4.13.2'
+    testImplementation "junit:junit:4.13.2"
     // https://developer.android.com/jetpack/androidx/releases/test/#1.2.0
-
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.1.3"
 }
 
 sentry {

diff --git a/android/build.gradle b/android/build.gradle
@@ -1,6 +1,6 @@
 ext {
-    compileSdkVersion = 34
-    targetSdkVersion = 34
+    compileSdkVersion = 35
+    targetSdkVersion = 35
     appCompatVersion = "1.7.0"
 }
 
@@ -10,26 +10,26 @@ allprojects {
         mavenCentral()
     }
 }
-rootProject.buildDir = '../build'
+rootProject.buildDir = "../build"
 subprojects {
     afterEvaluate { project ->
         if (project.plugins.hasPlugin("com.android.application") ||
                 project.plugins.hasPlugin("com.android.library")) {
             project.android {
-                compileSdkVersion 34
+                compileSdkVersion rootProject.ext.compileSdkVersion
                 buildToolsVersion "34.0.0"
             }
         }
     }
     project.buildDir = "${rootProject.buildDir}/${project.name}"
-    project.evaluationDependsOn(':app')
+    project.evaluationDependsOn(":app")
 }
 
 tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
 configurations.all {
     resolutionStrategy {
-        force 'androidx.core:core-ktx:1.15.0'
+        force "androidx.core:core-ktx:1.15.0"
     }
 }
diff --git a/lib/Backend/move_lists.dart b/lib/Backend/move_lists.dart
@@ -215,13 +215,13 @@ Future<void> runAction(BaseAction action, BaseStatefulDevice device) async {
     plausible.event(name: "Run Sequence", props: {"Sequence Repeat": action.repeat.toInt().toString(), "Sequence Device Type": device.baseDeviceDefinition.deviceType.name, "Sequence Moves": action.moves.length.toString()});
     if (action.moves.isNotEmpty && action.moves.length <= 5 && device.baseDeviceDefinition.deviceType != DeviceType.ears) {
       int preset = 1; //TODO: store
-      String cmd = "USERMOVE U${preset}P${action.moves.length}N${action.repeat.toInt() - 1}";
-      String a = '';
-      String b = '';
-      String e = '';
-      String f = '';
-      String sl = '';
-      String m = '';
+      String cmd = "USERMOVE U${preset}P${action.moves.length}N${action.repeat.toInt()}";
+      String a = ''; // servo 1 position
+      String b = ''; // servo 2 position
+      String e = ''; // servo 1 easing
+      String f = ''; // servo 2 easing
+      String sl = ''; // servo 1 speed
+      String m = ''; // servo 2 speed
       for (int i = 0; i < action.moves.length; i++) {
         Move move = action.moves[i];
         if (i == 0 && move.moveType == MoveType.delay) {