Merge pull request #389 from ytai/NoProvideAppcompat

hannesa2 · web-flow · commit f1781833331a · 2024-06-12T09:15:14.000+02:00
Don't provoide appcompat
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -15,4 +15,6 @@ android {
 dependencies {
     implementation project(':IOIOLibAndroidBluetooth')
     implementation project(':IOIOLibAndroidAccessory')
+
+    implementation 'androidx.appcompat:appcompat:1.6.1'
 }
diff --git 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'
 

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ android {`
`14`	`14`
`15`	`15`	`dependencies {`
`16`	`16`	`api project(":IOIOLibCore")`
`17`		`- api 'androidx.appcompat:appcompat:1.6.1'`
	`17`	`+ implementation 'androidx.appcompat:appcompat:1.6.1'`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`publishing {`
Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,7 @@ dependencies {`
`18`	`18`
`19`	`19`	`implementation project(':IOIOLibAndroidBluetooth')`
`20`	`20`	`implementation project(':IOIOLibAndroidAccessory')`
	`21`	`+`
	`22`	`+ implementation 'androidx.appcompat:appcompat:1.6.1'`
`21`	`23`	`}`
`22`	`24`
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,6 @@ dependencies {`
`16`	`16`	`implementation project(':IOIOLibAndroidBluetooth')`
`17`	`17`	`implementation project(':IOIOLibAndroidAccessory')`
`18`	`18`	`implementation project(':IOIOLibAndroidDevice')`
	`19`	`+`
	`20`	`+ implementation 'androidx.appcompat:appcompat:1.6.1'`
`19`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,6 @@ android {`
`15`	`15`	`dependencies {`
`16`	`16`	`implementation project(':IOIOLibAndroidBluetooth')`
`17`	`17`	`implementation project(':IOIOLibAndroidAccessory')`
	`18`	`+`
	`19`	`+ implementation 'androidx.appcompat:appcompat:1.6.1'`
`18`	`20`	`}`