commit c5dca23de66a93a8ca7809174191e1778b2efe38 Author: syphyr <syp...@gmail.com> Date: Tue Nov 2 00:43:15 2021 +0100
Cleanup dependency implementations and list Fixes: "Implements #509: Use Gradle Version Catalog" Use same library implentations as before Gradle Version Catalog was introduced. Some extra implentations were added when Gradle Version Catalog was introduced and are not needed to build the project. Also fix spacing in dependency list. --- app-mini/build.gradle | 5 ++--- app-tv/build.gradle | 5 ++--- app/build.gradle | 9 +++----- dependencies.gradle | 58 +++++++++++++++++++++++++-------------------------- 4 files changed, 36 insertions(+), 41 deletions(-) diff --git a/app-mini/build.gradle b/app-mini/build.gradle index 8b961574..89227cee 100644 --- a/app-mini/build.gradle +++ b/app-mini/build.gradle @@ -35,12 +35,11 @@ android { project(path: ':intentintegrator'), project(':orbotservice'), libs.android_material, + libs.androidx_constraint, libs.androidx_coordinator, - libs.androidx_localbroadcast, libs.androidx_palette, libs.androidx_recyclerview, - libs.apl_appintro, - libs.guardian_jtorctl + libs.apl_appintro ) androidTestImplementation libs.fastlane_screengrab } diff --git a/app-tv/build.gradle b/app-tv/build.gradle index f4978231..e5f33882 100644 --- a/app-tv/build.gradle +++ b/app-tv/build.gradle @@ -42,16 +42,15 @@ dependencies { project(':orbotservice'), libs.android_material, libs.android_snowfall, + libs.androidx_constraint, libs.androidx_coordinator, libs.androidx_leanback_core, libs.androidx_leanback_paging, libs.androidx_leanback_preferences, libs.androidx_leanback_tab, - libs.androidx_localbroadcast, libs.androidx_palette, libs.androidx_recyclerview, - libs.apl_appintro, - libs.guardian_jtorctl + libs.apl_appintro ) androidTestImplementation libs.fastlane_screengrab } diff --git a/app/build.gradle b/app/build.gradle index 93304560..0f5a8b21 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -58,18 +58,15 @@ android { project(':appcore'), project(':intentintegrator'), project(':orbotservice'), - libs.apl_appintro, + libs.android_material, libs.android_snowfall, libs.android_volley, - libs.androidx_core, libs.androidx_localbroadcast, - libs.androidx_palette, - libs.android_material, + libs.apl_appintro, libs.bclogic_pulsator, - libs.guardian_jtorctl, libs.ipt_proxy ) androidTestImplementation libs.fastlane_screengrab } -} \ No newline at end of file +} diff --git a/dependencies.gradle b/dependencies.gradle index 74e5364d..555c4977 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -5,12 +5,12 @@ ext { android_snowfall : "1.2.1", android_volley : "1.2.0", androidx_appcompat : "1.3.1", - androidx_constraint : "2.1.0", - androidx_coordinator: "1.1.0", + androidx_constraint : "2.1.0", + androidx_coordinator : "1.1.0", androidx_core : "1.6.0", androidx_leanback : "1.2.0-alpha01", - androidx_leanback_paging : "1.1.0-alpha08", - androidx_leanback_tab : "1.1.0-beta01", + androidx_leanback_paging : "1.1.0-alpha08", + androidx_leanback_tab : "1.1.0-beta01", androidx_localbroadcast : "1.0.0", androidx_palette : "1.0.0", androidx_recyclerview : "1.2.1", @@ -26,29 +26,29 @@ ext { ] libs = [ - android_material : "com.google.android.material:material:$versions.android_material", - android_shell : "com.jaredrummler:android-shell:$versions.android_shell" , - android_snowfall : "com.github.jetradarmobile:android-snowfall:$versions.android_snowfall" , - android_volley : "com.android.volley:volley:$versions.android_volley" , - androidx_appcompat : "androidx.appcompat:appcompat:$versions.androidx_appcompat" , - androidx_constraint : "androidx.constraintlayout:constraintlayout:$versions.androidx_constraint" , - androidx_coordinator : "androidx.coordinatorlayout:coordinatorlayout:$versions.androidx_coordinator" , - androidx_core : "androidx.core:core:$versions.androidx_core" , - androidx_leanback_core : "androidx.leanback:leanback:$versions.androidx_leanback" , - androidx_leanback_paging : "androidx.leanback:leanback-paging:$versions.androidx_leanback_paging" , - androidx_leanback_preferences: "androidx.leanback:leanback-preference:$versions.androidx_leanback" , - androidx_leanback_tab : "androidx.leanback:leanback-tab:$versions.androidx_leanback_tab" , - androidx_localbroadcast : "androidx.localbroadcastmanager:localbroadcastmanager:$versions.androidx_localbroadcast" , - androidx_palette : "androidx.palette:palette:$versions.androidx_palette" , - androidx_recyclerview : "androidx.recyclerview:recyclerview:$versions.androidx_recyclerview" , - apl_appintro : "com.github.apl-devs:appintro:$versions.apl_appintro" , - bclogic_pulsator : "pl.bclogic:pulsator4droid:$versions.bclogic_pulsator" , - fastlane_screengrab : "tools.fastlane:screengrab:$versions.fastlane_screengrab" , - guardian_geoip : "info.guardianproject:geoip:$versions.guardian_geoip" , - guardian_jsocks : "com.gitlab.guardianproject:jsocksandroid:$versions.guardian_jsocks" , - guardian_jtorctl : "info.guardianproject:jtorctl:$versions.guardian_jtorctl" , - ipt_proxy : "com.github.tladesignz:IPtProxy:$versions.ipt_proxy" , - portmapper : "com.offbynull.portmapper:portmapper:$versions.portmapper" , - tor_android : "info.guardianproject:tor-android:$versions.tor_android" + android_material : "com.google.android.material:material:$versions.android_material", + android_shell : "com.jaredrummler:android-shell:$versions.android_shell", + android_snowfall : "com.github.jetradarmobile:android-snowfall:$versions.android_snowfall", + android_volley : "com.android.volley:volley:$versions.android_volley", + androidx_appcompat : "androidx.appcompat:appcompat:$versions.androidx_appcompat", + androidx_constraint : "androidx.constraintlayout:constraintlayout:$versions.androidx_constraint", + androidx_coordinator : "androidx.coordinatorlayout:coordinatorlayout:$versions.androidx_coordinator", + androidx_core : "androidx.core:core:$versions.androidx_core", + androidx_leanback_core : "androidx.leanback:leanback:$versions.androidx_leanback", + androidx_leanback_paging : "androidx.leanback:leanback-paging:$versions.androidx_leanback_paging", + androidx_leanback_preferences : "androidx.leanback:leanback-preference:$versions.androidx_leanback", + androidx_leanback_tab : "androidx.leanback:leanback-tab:$versions.androidx_leanback_tab", + androidx_localbroadcast : "androidx.localbroadcastmanager:localbroadcastmanager:$versions.androidx_localbroadcast", + androidx_palette : "androidx.palette:palette:$versions.androidx_palette", + androidx_recyclerview : "androidx.recyclerview:recyclerview:$versions.androidx_recyclerview", + apl_appintro : "com.github.apl-devs:appintro:$versions.apl_appintro", + bclogic_pulsator : "pl.bclogic:pulsator4droid:$versions.bclogic_pulsator", + fastlane_screengrab : "tools.fastlane:screengrab:$versions.fastlane_screengrab", + guardian_geoip : "info.guardianproject:geoip:$versions.guardian_geoip", + guardian_jsocks : "com.gitlab.guardianproject:jsocksandroid:$versions.guardian_jsocks", + guardian_jtorctl : "info.guardianproject:jtorctl:$versions.guardian_jtorctl", + ipt_proxy : "com.github.tladesignz:IPtProxy:$versions.ipt_proxy", + portmapper : "com.offbynull.portmapper:portmapper:$versions.portmapper", + tor_android : "info.guardianproject:tor-android:$versions.tor_android" ] -} \ No newline at end of file +} _______________________________________________ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits