Skip to content

Commit f3b94cf

Browse files
committed
fix: use correct android lib and configure correctly
Signed-off-by: alperozturk <alper_ozturk@proton.me>
1 parent 09cf90d commit f3b94cf

File tree

3 files changed

+62
-3
lines changed

3 files changed

+62
-3
lines changed

app/build.gradle

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,10 @@ dependencies {
118118
exclude group: 'org.ogce', module: 'xpp3'
119119
}
120120

121+
implementation("com.github.nextcloud.android-common:ui:$nextcloudAndroidCommonLib")
122+
implementation("com.github.nextcloud.android-common:core:$nextcloudAndroidCommonLib")
123+
121124
// Nextcloud SSO
122-
implementation 'com.github.nextcloud.android-common:ui:f686054406'
123-
implementation 'com.github.nextcloud.android-common:core:f686054406'
124125
implementation("com.github.nextcloud:Android-SingleSignOn:$singleSignOnVersion") {
125126
version {
126127
strictly(singleSignOnVersion)
@@ -174,6 +175,14 @@ dependencies {
174175
testImplementation 'org.robolectric:robolectric:4.16'
175176
}
176177

178+
configurations.configureEach {
179+
resolutionStrategy.eachDependency { details ->
180+
if (details.requested.group == "com.github.nextcloud.android-common") {
181+
details.useVersion(nextcloudAndroidCommonLib)
182+
}
183+
}
184+
}
185+
177186
// Run the compiler as a separate process
178187
tasks.withType(JavaCompile).configureEach {
179188
options.fork = true

gradle.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,6 @@ org.gradle.parallel=true
1111
org.gradle.configureondemand=true
1212
kapt.incremental.apt=true
1313
org.gradle.daemon=true
14-
org.gradle.configuration-cache=true
14+
org.gradle.configuration-cache=true
15+
16+
nextcloudAndroidCommonLib=ab22edd0cf

gradle/verification-metadata.xml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10880,6 +10880,22 @@
1088010880
<sha256 value="5303c52251a065c7a20d741296a644f3eae50e939dd70c0f4fa7f2698f5b5797" origin="Generated by Gradle"/>
1088110881
</artifact>
1088210882
</component>
10883+
<component group="com.github.nextcloud.android-common" name="core" version="ab22edd0cf">
10884+
<artifact name="core-ab22edd0cf.aar">
10885+
<sha256 value="b3f49702e6022549a2a48083c7720ffac98af72ae383beab2b79f7ebeac6a6cf" origin="Generated by Gradle" reason="Artifact is not signed"/>
10886+
</artifact>
10887+
<artifact name="core-ab22edd0cf.module">
10888+
<sha256 value="eb57252f19f1897b92aa677fa3da43724e717dbae886d2fd24ed5804f3777288" origin="Generated by Gradle" reason="Artifact is not signed"/>
10889+
</artifact>
10890+
</component>
10891+
<component group="com.github.nextcloud.android-common" name="core" version="ab22edd0cf5e0de42a75c4688eecce3083c0530c">
10892+
<artifact name="core-ab22edd0cf5e0de42a75c4688eecce3083c0530c.aar">
10893+
<sha256 value="b3f49702e6022549a2a48083c7720ffac98af72ae383beab2b79f7ebeac6a6cf" origin="Generated by Gradle" reason="Artifact is not signed"/>
10894+
</artifact>
10895+
<artifact name="core-ab22edd0cf5e0de42a75c4688eecce3083c0530c.module">
10896+
<sha256 value="41158b60ba48367cb00adf5b63c639228f9725898bfc8c39212908cb16b8d3d2" origin="Generated by Gradle" reason="Artifact is not signed"/>
10897+
</artifact>
10898+
</component>
1088310899
<component group="com.github.nextcloud.android-common" name="core" version="f686054406">
1088410900
<artifact name="core-f686054406.aar">
1088510901
<sha256 value="b3f49702e6022549a2a48083c7720ffac98af72ae383beab2b79f7ebeac6a6cf" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -11044,6 +11060,22 @@
1104411060
<sha256 value="126b40bf6de993987b6f4e9a4c805a0fc5a33a012177e6c90cc307b22ce5b382" origin="Generated by Gradle"/>
1104511061
</artifact>
1104611062
</component>
11063+
<component group="com.github.nextcloud.android-common" name="material-color-utilities" version="ab22edd0cf">
11064+
<artifact name="material-color-utilities-ab22edd0cf.jar">
11065+
<sha256 value="1bd3fd83697314ba2a0628eb139cab7a4664f3c0b190c87ccd5b02b81e90dd26" origin="Generated by Gradle" reason="Artifact is not signed"/>
11066+
</artifact>
11067+
<artifact name="material-color-utilities-ab22edd0cf.module">
11068+
<sha256 value="e2260e19ab048b4b979c7a71cccc3819bf464e4a1177ad8c1c88f813fa2ccd89" origin="Generated by Gradle" reason="Artifact is not signed"/>
11069+
</artifact>
11070+
</component>
11071+
<component group="com.github.nextcloud.android-common" name="material-color-utilities" version="ab22edd0cf5e0de42a75c4688eecce3083c0530c">
11072+
<artifact name="material-color-utilities-ab22edd0cf5e0de42a75c4688eecce3083c0530c.jar">
11073+
<sha256 value="1bd3fd83697314ba2a0628eb139cab7a4664f3c0b190c87ccd5b02b81e90dd26" origin="Generated by Gradle" reason="Artifact is not signed"/>
11074+
</artifact>
11075+
<artifact name="material-color-utilities-ab22edd0cf5e0de42a75c4688eecce3083c0530c.module">
11076+
<sha256 value="312d68ec2ed0188c6102fa28b941be118fd006b92d834d0ce732270a28f25cef" origin="Generated by Gradle" reason="Artifact is not signed"/>
11077+
</artifact>
11078+
</component>
1104711079
<component group="com.github.nextcloud.android-common" name="material-color-utilities" version="f686054406">
1104811080
<artifact name="material-color-utilities-f686054406.jar">
1104911081
<sha256 value="1bd3fd83697314ba2a0628eb139cab7a4664f3c0b190c87ccd5b02b81e90dd26" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -11204,6 +11236,22 @@
1120411236
<sha256 value="2d47ff71f5e1e03d6ceee65e1296a380e4a26741c053c3abfe9615b76beaa6da" origin="Generated by Gradle"/>
1120511237
</artifact>
1120611238
</component>
11239+
<component group="com.github.nextcloud.android-common" name="ui" version="ab22edd0cf">
11240+
<artifact name="ui-ab22edd0cf.aar">
11241+
<sha256 value="57a52f8bea07c3a80c81c4c66fa60d91393cfc28e823bc910e9c1a99b4d416e4" origin="Generated by Gradle" reason="Artifact is not signed"/>
11242+
</artifact>
11243+
<artifact name="ui-ab22edd0cf.module">
11244+
<sha256 value="8dd0aeca966f9ae9a1371c2e55566ee9b1c74bb5ed25486259724cf61ef57eae" origin="Generated by Gradle" reason="Artifact is not signed"/>
11245+
</artifact>
11246+
</component>
11247+
<component group="com.github.nextcloud.android-common" name="ui" version="ab22edd0cf5e0de42a75c4688eecce3083c0530c">
11248+
<artifact name="ui-ab22edd0cf5e0de42a75c4688eecce3083c0530c.aar">
11249+
<sha256 value="57a52f8bea07c3a80c81c4c66fa60d91393cfc28e823bc910e9c1a99b4d416e4" origin="Generated by Gradle" reason="Artifact is not signed"/>
11250+
</artifact>
11251+
<artifact name="ui-ab22edd0cf5e0de42a75c4688eecce3083c0530c.module">
11252+
<sha256 value="f2567d13583a341210a8c23a2a0739ac01408e23e461d0fcefeb7b0103e9d22d" origin="Generated by Gradle" reason="Artifact is not signed"/>
11253+
</artifact>
11254+
</component>
1120711255
<component group="com.github.nextcloud.android-common" name="ui" version="f686054406">
1120811256
<artifact name="ui-f686054406.aar">
1120911257
<sha256 value="57a52f8bea07c3a80c81c4c66fa60d91393cfc28e823bc910e9c1a99b4d416e4" origin="Generated by Gradle" reason="Artifact is not signed"/>

0 commit comments

Comments
 (0)