Merge pull request #423 from ytai/PrepareKtsBuild

hannesa2 · web-flow · commit e6d2474d0c2f · 2025-06-03T10:24:20.000+02:00
Prepare kts build
diff --git a/IOIOBridge/build.gradle b/IOIOBridge/build.gradle
@@ -1,21 +1,22 @@
 apply plugin: "gradle-one-jar"
 
-task distJar(type: OneJar) {
-    mainClass = 'ioio.bridge.Main'
+tasks.register("distJar", OneJar) {
+    mainClass = "ioio.bridge.Main"
     version = null
 }
 
-task zip(type: Zip, dependsOn: distJar) {
-    archiveBaseName = 'IOIOBridge'
-    archiveVersion = '0103'
+tasks.register("zip", Zip) {
+    dependsOn distJar
+    archiveBaseName = "IOIOBridge"
+    archiveVersion = "0103"
 
     from distJar
-    from('ioiobridge', 'ioiobridge.bat')
-    rename 'IOIOBridge-standalone.jar', 'ioiobridge.jar'
+    from("ioiobridge", "ioiobridge.bat")
+    rename "IOIOBridge-standalone.jar", "ioiobridge.jar"
 }
 
 tasks.build.dependsOn zip
 
 dependencies {
-    implementation 'com.sparetimelabs:purejavacomm:1.0.1'
+    implementation "com.sparetimelabs:purejavacomm:1.0.1"
 }
diff --git a/IOIODude/build.gradle b/IOIODude/build.gradle
@@ -1,21 +1,22 @@
 apply plugin: "gradle-one-jar"
 
-task distJar(type: OneJar) {
-    mainClass = 'ioio.dude.IOIODudeMain'
+tasks.register("distJar", OneJar) {
+    mainClass = "ioio.dude.IOIODudeMain"
     version = null
 }
 
-task zip(type: Zip, dependsOn: distJar) {
-    archiveBaseName = 'IOIODude'
-    archiveVersion = '0103'
+tasks.register("zip", Zip) {
+    dependsOn distJar
+    archiveBaseName = "IOIODude"
+    archiveVersion = "0103"
 
     from distJar
-    from('ioiodude', 'ioiodude.bat')
-    rename 'IOIODude-standalone.jar', 'ioiodude.jar'
+    from("ioiodude", "ioiodude.bat")
+    rename "IOIODude-standalone.jar", "ioiodude.jar"
 }
 
 tasks.build.dependsOn zip
 
 dependencies {
-    implementation 'com.sparetimelabs:purejavacomm:1.0.1'
+    implementation "com.sparetimelabs:purejavacomm:1.0.1"
 }
diff --git a/IOIOLibAndroid/build.gradle b/IOIOLibAndroid/build.gradle
@@ -1,10 +1,10 @@
 plugins {
-    id 'com.android.library'
-    id 'maven-publish'
+    id "com.android.library"
+    id "maven-publish"
 }
 
 android {
-    namespace 'ioio.lib'
+    namespace "ioio.lib"
     defaultConfig {
         minSdkVersion 14
         compileSdk 34
@@ -14,14 +14,14 @@ android {
 
 dependencies {
     api project(":IOIOLibCore")
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation "androidx.appcompat:appcompat:1.6.1"
 }
 
 publishing {
     publications {
         release(MavenPublication) {
             afterEvaluate {
-                from components.findByName('release')
+                from components.findByName("release")
             }
         }
     }
diff --git a/IOIOLibAndroidAccessory/build.gradle b/IOIOLibAndroidAccessory/build.gradle
@@ -1,10 +1,10 @@
 plugins {
-    id 'com.android.library'
-    id 'maven-publish'
+    id "com.android.library"
+    id "maven-publish"
 }
 
 android {
-    namespace 'ioio.lib.accessory'
+    namespace "ioio.lib.accessory"
     defaultConfig {
         minSdkVersion 14
         compileSdk 34
@@ -20,7 +20,7 @@ publishing {
     publications {
         release(MavenPublication) {
             afterEvaluate {
-                from components.findByName('release')
+                from components.findByName("release")
             }
         }
     }
diff --git a/IOIOLibAndroidBluetooth/build.gradle b/IOIOLibAndroidBluetooth/build.gradle
@@ -1,10 +1,10 @@
 plugins {
-    id 'com.android.library'
-    id 'maven-publish'
+    id "com.android.library"
+    id "maven-publish"
 }
 
 android {
-    namespace 'ioio.lib.bluetooth'
+    namespace "ioio.lib.bluetooth"
     defaultConfig {
         minSdkVersion 14
         compileSdk 34
@@ -20,7 +20,7 @@ publishing {
     publications {
         release(MavenPublication) {
             afterEvaluate {
-                from components.findByName('release')
+                from components.findByName("release")
             }
         }
     }
diff --git a/IOIOLibAndroidDevice/build.gradle b/IOIOLibAndroidDevice/build.gradle
@@ -1,10 +1,10 @@
 plugins {
-    id 'com.android.library'
-    id 'maven-publish'
+    id "com.android.library"
+    id "maven-publish"
 }
 
 android {
-    namespace 'ioio.lib.android.device'
+    namespace "ioio.lib.android.device"
     defaultConfig {
         minSdkVersion 14
         compileSdk 34
@@ -20,7 +20,7 @@ publishing {
     publications {
         release(MavenPublication) {
             afterEvaluate {
-                from components.findByName('release')
+                from components.findByName("release")
             }
         }
     }
diff --git a/IOIOLibCore/build.gradle b/IOIOLibCore/build.gradle
@@ -49,7 +49,7 @@ publishing {
     publications {
         release(MavenPublication) {
             afterEvaluate {
-                from components.findByName('release')
+                from components.findByName("release")
             }
         }
     }
diff --git a/IOIOLibPC/build.gradle b/IOIOLibPC/build.gradle
@@ -1,19 +1,19 @@
 plugins {
-    id 'java-library'
+    id "java-library"
 }
 
 javadoc {
-    source = fileTree(dir: 'src/main/java')
+    source = fileTree(dir: "src/main/java")
     failOnError = false
 }
 
-tasks.register('javadocJar', Jar) {
-    archiveClassifier = 'javadoc'
+tasks.register("javadocJar", Jar) {
+    archiveClassifier = "javadoc"
     from javadoc
 }
 
-tasks.register('sourcesJar', Jar) {
-    archiveClassifier = 'sources'
+tasks.register("sourcesJar", Jar) {
+    archiveClassifier = "sources"
     from sourceSets.main.allSource
 }
 
@@ -22,7 +22,7 @@ artifacts {
 }
 
 dependencies {
-    implementation 'com.sparetimelabs:purejavacomm:1.0.1'
+    implementation "com.sparetimelabs:purejavacomm:1.0.1"
     api project(":IOIOLibCore")
 }
 
diff --git a/applications/HelloIOIO/build.gradle b/applications/HelloIOIO/build.gradle
@@ -1,5 +1,5 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
+apply plugin: "com.android.application"
+apply plugin: "kotlin-android"
 
 android {
     namespace "ioio.examples.hello"
@@ -13,7 +13,7 @@ android {
         versionName getTag()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        testInstrumentationRunnerArguments useTestStorageService: 'true'
+        testInstrumentationRunnerArguments useTestStorageService: "true"
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
@@ -22,11 +22,11 @@ android {
 }
 
 dependencies {
-    implementation project(':IOIOLibAndroidBluetooth')
-    implementation project(':IOIOLibAndroidAccessory')
-    implementation project(':IOIOLibAndroidDevice')
+    implementation project(":IOIOLibAndroidBluetooth")
+    implementation project(":IOIOLibAndroidAccessory")
+    implementation project(":IOIOLibAndroidDevice")
 
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation "androidx.appcompat:appcompat:1.6.1"
 
     androidTestImplementation "androidx.test.ext:junit-ktx:1.1.5"
     androidTestUtil "androidx.test.services:test-services:1.4.2"
diff --git a/applications/HelloIOIO/src/main/res/xml/accessory_filter.xml b/applications/HelloIOIO/src/main/res/xml/accessory_filter.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <usb-accessory model="IOIO"/>
+</resources>
diff --git a/applications/HelloIOIO/src/main/res/xml/device_filter.xml b/applications/HelloIOIO/src/main/res/xml/device_filter.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <usb-device vendor-id="6991" product-id="8" />
+</resources>
diff --git a/applications/HelloIOIOService/build.gradle b/applications/HelloIOIOService/build.gradle
@@ -1,7 +1,7 @@
-apply plugin: 'com.android.application'
+apply plugin: "com.android.application"
 
 android {
-    namespace 'ioio.examples.hello_service'
+    namespace "ioio.examples.hello_service"
     defaultConfig {
         minSdkVersion 14
         compileSdk 34
@@ -13,9 +13,9 @@ android {
 }
 
 dependencies {
-    implementation project(':IOIOLibAndroidBluetooth')
-    implementation project(':IOIOLibAndroidAccessory')
-    implementation project(':IOIOLibAndroidDevice')
+    implementation project(":IOIOLibAndroidBluetooth")
+    implementation project(":IOIOLibAndroidAccessory")
+    implementation project(":IOIOLibAndroidDevice")
 
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation "androidx.appcompat:appcompat:1.6.1"
 }
diff --git a/applications/HolidayIOIO/build.gradle b/applications/HolidayIOIO/build.gradle
@@ -1,5 +1,5 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
+apply plugin: "com.android.application"
+apply plugin: "kotlin-android"
 
 android {
     namespace "ioio.examples.holiday"
@@ -12,7 +12,7 @@ android {
         versionName getTag()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        testInstrumentationRunnerArguments useTestStorageService: 'true'
+        testInstrumentationRunnerArguments useTestStorageService: "true"
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
@@ -21,12 +21,12 @@ android {
 }
 
 dependencies {
-    implementation project(':IOIOLibAndroidBluetooth')
-    implementation project(':IOIOLibAndroidAccessory')
-    implementation project(':IOIOLibAndroidDevice')
-    implementation 'androidx.test:rules:1.5.0'
+    implementation project(":IOIOLibAndroidBluetooth")
+    implementation project(":IOIOLibAndroidAccessory")
+    implementation project(":IOIOLibAndroidDevice")
+    implementation "androidx.test:rules:1.5.0"
 
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation "androidx.appcompat:appcompat:1.6.1"
 
     androidTestImplementation "androidx.test.ext:junit-ktx:1.1.5"
     androidTestUtil "androidx.test.services:test-services:1.4.2"
diff --git a/applications/IOIOConnectionTester/build.gradle b/applications/IOIOConnectionTester/build.gradle
@@ -1,6 +1,6 @@
-apply plugin: 'java'
+apply plugin: "java"
 
 dependencies {
-    implementation 'com.google.guava:guava:32.1.3-jre'
-    implementation project(':IOIOLibCore')
+    implementation "com.google.guava:guava:32.1.3-jre"
+    implementation project(":IOIOLibCore")
 }
diff --git a/applications/IOIOConnectionTesterAndroid/build.gradle b/applications/IOIOConnectionTesterAndroid/build.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'com.android.application'
+apply plugin: "com.android.application"
 
 android {
     namespace "ioio.connection_tester"
@@ -13,12 +13,12 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.guava:guava:32.1.3-jre'
-    implementation project(':IOIOConnectionTester')
+    implementation "com.google.guava:guava:32.1.3-jre"
+    implementation project(":IOIOConnectionTester")
 
-    implementation project(':IOIOLibAndroidBluetooth')
-    implementation project(':IOIOLibAndroidAccessory')
+    implementation project(":IOIOLibAndroidBluetooth")
+    implementation project(":IOIOLibAndroidAccessory")
 
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation "androidx.appcompat:appcompat:1.6.1"
 }
 
diff --git a/applications/IOIOManager/build.gradle b/applications/IOIOManager/build.gradle
@@ -1,5 +1,5 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
+apply plugin: "com.android.application"
+apply plugin: "kotlin-android"
 
 android {
     namespace "ioio.manager"
@@ -12,7 +12,7 @@ android {
         versionName getTag()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        testInstrumentationRunnerArguments useTestStorageService: 'true'
+        testInstrumentationRunnerArguments useTestStorageService: "true"
     }
 
     compileOptions {
@@ -23,18 +23,18 @@ android {
     buildTypes {
         release {
             minifyEnabled true
-            proguardFile 'proguard-ioio.txt'
+            proguardFile "proguard-ioio.txt"
         }
     }
 
 }
 
 dependencies {
-    implementation project(':IOIOLibAndroidBluetooth')
-    implementation project(':IOIOLibAndroidAccessory')
-    implementation project(':IOIOLibAndroidDevice')
+    implementation project(":IOIOLibAndroidBluetooth")
+    implementation project(":IOIOLibAndroidAccessory")
+    implementation project(":IOIOLibAndroidDevice")
 
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation "androidx.appcompat:appcompat:1.6.1"
 
     androidTestImplementation "androidx.test.ext:junit-ktx:1.1.5"
     androidTestUtil "androidx.test.services:test-services:1.4.2"
diff --git a/applications/IOIOSimpleApp/build.gradle b/applications/IOIOSimpleApp/build.gradle
diff --git a/applications/IOIOTestBed/build.gradle b/applications/IOIOTestBed/build.gradle
diff --git a/applications/IOIOTortureTest/build.gradle b/applications/IOIOTortureTest/build.gradle
diff --git a/applications/ShoeBot/build.gradle b/applications/ShoeBot/build.gradle
diff --git a/build.gradle b/build.gradle

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`plugins {`
`2`		`- id 'com.android.library'`
`3`		`- id 'maven-publish'`
	`2`	`+ id "com.android.library"`
	`3`	`+ id "maven-publish"`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`android {`
`7`		`- namespace 'ioio.lib'`
	`7`	`+ namespace "ioio.lib"`
`8`	`8`	`defaultConfig {`
`9`	`9`	`minSdkVersion 14`
`10`	`10`	`compileSdk 34`
`@@ -14,14 +14,14 @@ android {`
`14`	`14`
`15`	`15`	`dependencies {`
`16`	`16`	`api project(":IOIOLibCore")`
`17`		`- implementation 'androidx.appcompat:appcompat:1.6.1'`
	`17`	`+ implementation "androidx.appcompat:appcompat:1.6.1"`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`publishing {`
`21`	`21`	`publications {`
`22`	`22`	`release(MavenPublication) {`
`23`	`23`	`afterEvaluate {`
`24`		`- from components.findByName('release')`
	`24`	`+ from components.findByName("release")`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ publishing {`
`49`	`49`	`publications {`
`50`	`50`	`release(MavenPublication) {`
`51`	`51`	`afterEvaluate {`
`52`		`- from components.findByName('release')`
	`52`	`+ from components.findByName("release")`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,19 @@`
`1`	`1`	`plugins {`
`2`		`- id 'java-library'`
	`2`	`+ id "java-library"`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`javadoc {`
`6`		`- source = fileTree(dir: 'src/main/java')`
	`6`	`+ source = fileTree(dir: "src/main/java")`
`7`	`7`	`failOnError = false`
`8`	`8`	`}`
`9`	`9`
`10`		`-tasks.register('javadocJar', Jar) {`
`11`		`- archiveClassifier = 'javadoc'`
	`10`	`+tasks.register("javadocJar", Jar) {`
	`11`	`+ archiveClassifier = "javadoc"`
`12`	`12`	`from javadoc`
`13`	`13`	`}`
`14`	`14`
`15`		`-tasks.register('sourcesJar', Jar) {`
`16`		`- archiveClassifier = 'sources'`
	`15`	`+tasks.register("sourcesJar", Jar) {`
	`16`	`+ archiveClassifier = "sources"`
`17`	`17`	`from sourceSets.main.allSource`
`18`	`18`	`}`
`19`	`19`
`@@ -22,7 +22,7 @@ artifacts {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`dependencies {`
`25`		`- implementation 'com.sparetimelabs:purejavacomm:1.0.1'`
	`25`	`+ implementation "com.sparetimelabs:purejavacomm:1.0.1"`
`26`	`26`	`api project(":IOIOLibCore")`
`27`	`27`	`}`
`28`	`28`