From 1d9c03b25a3ecaa63e957a09f12583ba89ca3ba8 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Wed, 12 Jun 2024 09:00:51 +0200 Subject: [PATCH 1/2] Restructure dependencies for modules --- build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.gradle b/build.gradle index f9d2554e..9609d9ea 100644 --- a/build.gradle +++ b/build.gradle @@ -17,9 +17,7 @@ allprojects { version = getTag() ext.versionNamespace = 'IOIO' ext.versionString = sprintf("%s%s", versionNamespace, version) -} -subprojects { apply plugin: 'maven-publish' apply plugin: 'signing' From 30e1599d256e90499dd69c0d2f32bf5656847439 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Wed, 12 Jun 2024 08:30:21 +0200 Subject: [PATCH 2/2] Don't provide appcompat --- IOIOLibAndroid/build.gradle | 2 +- applications/HelloIOIO/build.gradle | 2 ++ applications/HolidayIOIO/build.gradle | 2 ++ applications/IOIOConnectionTesterAndroid/build.gradle | 2 ++ applications/IOIOManager/build.gradle | 2 ++ applications/IOIOSimpleApp/build.gradle | 2 ++ applications/IOIOTestBed/build.gradle | 2 ++ applications/IOIOTortureTest/build.gradle | 2 ++ applications/ShoeBot/build.gradle | 2 ++ 9 files changed, 17 insertions(+), 1 deletion(-) diff --git a/IOIOLibAndroid/build.gradle b/IOIOLibAndroid/build.gradle index eea55cbe..9cbb602f 100644 --- a/IOIOLibAndroid/build.gradle +++ b/IOIOLibAndroid/build.gradle @@ -14,7 +14,7 @@ android { dependencies { api project(":IOIOLibCore") - api 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.appcompat:appcompat:1.6.1' } publishing { diff --git a/applications/HelloIOIO/build.gradle b/applications/HelloIOIO/build.gradle index 3d8b3b65..912d5c30 100644 --- a/applications/HelloIOIO/build.gradle +++ b/applications/HelloIOIO/build.gradle @@ -26,6 +26,8 @@ dependencies { implementation project(':IOIOLibAndroidAccessory') implementation project(':IOIOLibAndroidDevice') + 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" androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1" diff --git a/applications/HolidayIOIO/build.gradle b/applications/HolidayIOIO/build.gradle index 75f7fa38..e4413fba 100644 --- a/applications/HolidayIOIO/build.gradle +++ b/applications/HolidayIOIO/build.gradle @@ -26,6 +26,8 @@ dependencies { implementation project(':IOIOLibAndroidDevice') implementation 'androidx.test:rules:1.5.0' + 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" androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1" diff --git a/applications/IOIOConnectionTesterAndroid/build.gradle b/applications/IOIOConnectionTesterAndroid/build.gradle index 15d3e1aa..5600fee0 100644 --- a/applications/IOIOConnectionTesterAndroid/build.gradle +++ b/applications/IOIOConnectionTesterAndroid/build.gradle @@ -18,5 +18,7 @@ dependencies { implementation project(':IOIOLibAndroidBluetooth') implementation project(':IOIOLibAndroidAccessory') + + implementation 'androidx.appcompat:appcompat:1.6.1' } diff --git a/applications/IOIOManager/build.gradle b/applications/IOIOManager/build.gradle index dc7e1135..d4dc2fae 100644 --- a/applications/IOIOManager/build.gradle +++ b/applications/IOIOManager/build.gradle @@ -34,6 +34,8 @@ dependencies { implementation project(':IOIOLibAndroidAccessory') implementation project(':IOIOLibAndroidDevice') + 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" androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1" diff --git a/applications/IOIOSimpleApp/build.gradle b/applications/IOIOSimpleApp/build.gradle index 2da68180..af24d573 100644 --- a/applications/IOIOSimpleApp/build.gradle +++ b/applications/IOIOSimpleApp/build.gradle @@ -25,6 +25,8 @@ dependencies { implementation project(':IOIOLibAndroidAccessory') implementation project(':IOIOLibAndroidDevice') + 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" androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1" diff --git a/applications/IOIOTestBed/build.gradle b/applications/IOIOTestBed/build.gradle index ced7ecf7..4b226e2f 100644 --- a/applications/IOIOTestBed/build.gradle +++ b/applications/IOIOTestBed/build.gradle @@ -16,4 +16,6 @@ dependencies { implementation project(':IOIOLibAndroidBluetooth') implementation project(':IOIOLibAndroidAccessory') implementation project(':IOIOLibAndroidDevice') + + implementation 'androidx.appcompat:appcompat:1.6.1' } diff --git a/applications/IOIOTortureTest/build.gradle b/applications/IOIOTortureTest/build.gradle index 91a3debd..e00f0a4b 100644 --- a/applications/IOIOTortureTest/build.gradle +++ b/applications/IOIOTortureTest/build.gradle @@ -16,4 +16,6 @@ dependencies { implementation project(':IOIOLibAndroidBluetooth') implementation project(':IOIOLibAndroidAccessory') implementation project(':IOIOLibAndroidDevice') + + implementation 'androidx.appcompat:appcompat:1.6.1' } diff --git a/applications/ShoeBot/build.gradle b/applications/ShoeBot/build.gradle index 283b0e1e..c5eb4d23 100644 --- a/applications/ShoeBot/build.gradle +++ b/applications/ShoeBot/build.gradle @@ -15,4 +15,6 @@ android { dependencies { implementation project(':IOIOLibAndroidBluetooth') implementation project(':IOIOLibAndroidAccessory') + + implementation 'androidx.appcompat:appcompat:1.6.1' }