Include xml attribute strings from res-public to sourceSet. (#404)

mapbox · Jun 8, 2021 · 6aa7811 · 6aa7811
1 parent c710cb7
commit 6aa7811
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 5 deletions.
diff --git a/plugin-attribution/build.gradle.kts b/plugin-attribution/build.gradle.kts
@@ -19,6 +19,11 @@ android {
       isIncludeAndroidResources = true
     }
   }
+
+  sourceSets {
+    // limit amount of exposed library resources
+    getByName("main").res.srcDirs("src/main/res-public")
+  }
 }
 
 dependencies {

diff --git a/plugin-attribution/src/main/res-public/values/public.xml b/plugin-attribution/src/main/res-public/values/public.xml
@@ -9,7 +9,7 @@
     <public name="mapbox_attributionIconColor" type="attr" />
 
     <!-- Defines where the attribution icon is positioned on the map -->
-    <public name="mapbox_attributionGravity" type="attr" >
+    <public name="mapbox_attributionGravity" type="attr" />
 
     <!-- Defines the margin to the left that the attribution icon honors. -->
     <public name="mapbox_attributionMarginLeft" type="attr" />

diff --git a/plugin-compass/build.gradle.kts b/plugin-compass/build.gradle.kts
@@ -13,6 +13,11 @@ android {
     targetSdkVersion(AndroidVersions.targetSdkVersion)
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
+
+  sourceSets {
+    // limit amount of exposed library resources
+    getByName("main").res.srcDirs("src/main/res-public")
+  }
 }
 
 dependencies {

diff --git a/plugin-compass/src/main/res-public/values/public.xml b/plugin-compass/src/main/res-public/values/public.xml
@@ -6,7 +6,7 @@
     <public name="mapbox_compassEnabled" type="attr" />
 
     <!-- Defines where the compass is positioned on the map -->
-    <public name="mapbox_compassGravity" type="attr" >
+    <public name="mapbox_compassGravity" type="attr" />
 
     <!-- Defines the margin to the left that the compass icon honors. -->
     <public name="mapbox_compassMarginLeft" type="attr" />

diff --git a/plugin-gestures/build.gradle.kts b/plugin-gestures/build.gradle.kts
@@ -19,6 +19,11 @@ android {
       isIncludeAndroidResources = true
     }
   }
+
+  sourceSets {
+    // limit amount of exposed library resources
+    getByName("main").res.srcDirs("src/main/res-public")
+  }
 }
 
 dependencies {

diff --git a/plugin-locationcomponent/build.gradle.kts b/plugin-locationcomponent/build.gradle.kts
@@ -14,6 +14,11 @@ android {
     targetSdkVersion(AndroidVersions.targetSdkVersion)
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
+
+  sourceSets {
+    // limit amount of exposed library resources
+    getByName("main").res.srcDirs("src/main/res-public")
+  }
 }
 
 dependencies {

diff --git a/plugin-logo/build.gradle.kts b/plugin-logo/build.gradle.kts
@@ -13,6 +13,11 @@ android {
     targetSdkVersion(AndroidVersions.targetSdkVersion)
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
+
+  sourceSets {
+    // limit amount of exposed library resources
+    getByName("main").res.srcDirs("src/main/res-public")
+  }
 }
 
 dependencies {

diff --git a/plugin-logo/src/main/res-public/values/public.xml b/plugin-logo/src/main/res-public/values/public.xml
@@ -6,7 +6,7 @@
     <public name="mapbox_logoEnabled" type="attr" />
 
     <!-- Defines where the logo is positioned on the map -->
-    <public name="mapbox_logoGravity" type="attr" >
+    <public name="mapbox_logoGravity" type="attr" />
 
     <!-- Defines the margin to the left that the attribution icon honors. -->
     <public name="mapbox_logoMarginLeft" type="attr" />

diff --git a/plugin-scalebar/build.gradle.kts b/plugin-scalebar/build.gradle.kts
@@ -13,6 +13,11 @@ android {
     targetSdkVersion(AndroidVersions.targetSdkVersion)
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
+
+  sourceSets {
+    // limit amount of exposed library resources
+    getByName("main").res.srcDirs("src/main/res-public")
+  }
 }
 
 dependencies {

diff --git a/plugin-scalebar/src/main/res-public/values/public.xml b/plugin-scalebar/src/main/res-public/values/public.xml
@@ -6,7 +6,7 @@
     <public name="mapbox_scaleBarEnabled" type="attr" />
 
     <!-- Defines where the scale bar is positioned on the map -->
-    <public name="mapbox_scaleBarGravity" type="attr" >
+    <public name="mapbox_scaleBarGravity" type="attr" />
 
     <!-- Defines the margin to the left that the scale bar honors. -->
     <public name="mapbox_scaleBarMarginLeft" type="attr" />

diff --git a/sdk/build.gradle.kts b/sdk/build.gradle.kts
@@ -35,6 +35,11 @@ android {
       execution = "ANDROIDX_TEST_ORCHESTRATOR"
     }
   }
+
+  sourceSets {
+    // limit amount of exposed library resources
+    getByName("main").res.srcDirs("src/main/res-public")
+  }
 }
 
 dependencies {

diff --git a/sdk/src/main/res-public/values/public.xml b/sdk/src/main/res-public/values/public.xml
@@ -49,5 +49,5 @@
     <public name="mapbox_cameraPaddingRight" type="attr"/>
 
     <!-- The default style uri to load when no style is set. -->
-    <attr name="mapbox_styleUri" format="string" />
+    <public name="mapbox_styleUri" type="attr" />
 </resources>