Skip to content

Commit c209eb6

Browse files
timscriptovtimscriptov
committed
Migrated to GVS
1 parent dec5d9a commit c209eb6

File tree

10 files changed

+136
-74
lines changed

10 files changed

+136
-74
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ gradlew
44
gradlew.bat
55
/local.properties
66
/.idea
7-
/gradle
87
.DS_Store
98
/build
109
/captures

‎adal/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ android {
4444
}
4545

4646
dependencies {
47-
implementation 'androidx.appcompat:appcompat:1.6.1'
48-
implementation 'com.google.code.gson:gson:2.10.1'
49-
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
50-
implementation 'org.jetbrains:annotations:24.0.1'
51-
implementation 'com.google.android.material:material:1.8.0'
47+
implementation jetpack.appcompat
48+
implementation jetpack.material
49+
50+
implementation misc.gson
51+
implementation misc.annotations
5252
}

‎app/build.gradle‎

Lines changed: 12 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -61,39 +61,17 @@ dependencies {
6161
implementation project(':fmod')
6262
implementation project(':crashreporter')
6363

64-
implementation 'commons-io:commons-io:2.11.0'
64+
implementation jetpack.appcompat
65+
implementation jetpack.preference
66+
implementation jetpack.vectordrawable.animated
67+
implementation jetpack.core
68+
implementation jetpack.constraint
69+
implementation jetpack.vp2
70+
implementation jetpack.material
6571

66-
implementation 'androidx.appcompat:appcompat:1.6.1'
67-
implementation 'androidx.preference:preference-ktx:1.2.0'
68-
implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
69-
implementation "androidx.core:core-ktx:1.9.0"
70-
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
71-
implementation "androidx.viewpager2:viewpager2:1.0.0"
72-
73-
implementation 'com.google.android.material:material:1.8.0'
74-
implementation 'com.google.code.gson:gson:2.10.1'
75-
76-
implementation 'org.jetbrains:annotations:24.0.1'
77-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
78-
//noinspection DuplicatePlatformClasses
79-
implementation 'org.apache.httpcomponents:httpclient:4.5.14'
80-
implementation 'org.apache.httpcomponents:httpmime:4.5.14'
81-
82-
implementation 'com.madgag.spongycastle:pkix:1.54.0.0'
83-
implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.2'
84-
85-
// Architectural Components
86-
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1"
87-
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1"
88-
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.1"
89-
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
90-
91-
// Room
92-
implementation "androidx.room:room-runtime:2.5.1"
93-
94-
// Kotlin Extensions and Coroutines support for Room
95-
implementation "androidx.room:room-ktx:2.5.1"
96-
97-
// androidx.fragment
98-
implementation "androidx.fragment:fragment-ktx:1.5.6"
72+
implementation misc.gson
73+
implementation misc.annotations
74+
implementation misc.annotations.android
75+
implementation misc.commons.io
76+
implementation misc.coroutines.core
9977
}

‎crashreporter/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ android {
2525

2626
dependencies {
2727
implementation fileTree(dir: 'libs', include: ['*.jar'])
28-
implementation 'androidx.recyclerview:recyclerview:1.3.0'
29-
implementation 'androidx.appcompat:appcompat:1.6.1'
28+
implementation jetpack.recyclerview
29+
implementation jetpack.appcompat
30+
implementation jetpack.material
3031

31-
implementation 'com.google.android.material:material:1.8.0'
32-
33-
implementation 'org.jetbrains:annotations:24.0.1'
32+
implementation misc.annotations
33+
implementation misc.annotations.android
3434
}

‎fmod/build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@ android {
2424
}
2525

2626
dependencies {
27-
implementation 'androidx.annotation:annotation:1.6.0'
27+
implementation misc.annotations
28+
implementation misc.annotations.android
2829
}

‎gradle/wrapper/gradle-wrapper.jar‎

58.1 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists

‎minecraft/build.gradle‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,18 @@ dependencies {
3333
implementation project(':adal')
3434
implementation project(':xbox')
3535

36-
implementation 'androidx.appcompat:appcompat:1.6.1'
37-
implementation 'com.google.code.gson:gson:2.10.1'
38-
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
39-
implementation 'org.jetbrains:annotations:24.0.1'
40-
implementation 'com.google.android.material:material:1.8.0'
36+
implementation jetpack.appcompat
37+
implementation jetpack.material
4138

39+
implementation fb.firebase.messaging
40+
implementation fb.firebase.iid
41+
42+
implementation misc.gson
43+
implementation misc.annotations
44+
implementation misc.annotations.android
4245
//noinspection DuplicatePlatformClasses
43-
implementation 'org.apache.httpcomponents:httpclient:4.5.14'
44-
implementation 'org.apache.httpcomponents:httpmime:4.5.14'
46+
implementation misc.httpclient
47+
implementation misc.httpmime
4548

46-
implementation 'com.google.firebase:firebase-messaging:23.1.2'
47-
implementation 'com.google.firebase:firebase-iid:21.1.0'
48-
runtimeOnly 'com.google.gms:google-services:4.3.15'
49+
runtimeOnly google.services
4950
}

‎settings.gradle‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,88 @@ pluginManagement {
77
}
88
}
99
dependencyResolutionManagement {
10+
def latestFastAdapterRelease = "5.7.0"
11+
def jetpack_version = '2.5.1'
12+
1013
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
1114
repositories {
1215
google()
1316
mavenCentral()
1417
maven { url 'https://jitpack.io' }
1518
}
19+
20+
versionCatalogs {
21+
mcal {
22+
library('webview', 'com.github.TimScriptov.App-UI-Designer:webview:1.0.9')
23+
}
24+
25+
jetpack {
26+
library('mvvm_viewmodel', 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1')
27+
library('mvvm_runtime', 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1')
28+
library('mvvm_livedata', 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1')
29+
library('mvvm_extensions', 'androidx.lifecycle:lifecycle-extensions:2.2.0')
30+
library('browser', 'androidx.browser:browser:1.5.0')
31+
library('recyclerview', 'androidx.recyclerview:recyclerview:1.3.0')
32+
library('vectordrawable_animated', 'androidx.vectordrawable:vectordrawable-animated:1.1.0')
33+
library('core', 'androidx.core:core-ktx:1.9.0')
34+
library('appcompat', 'androidx.appcompat:appcompat:1.6.1')
35+
library('preference', 'androidx.preference:preference-ktx:1.2.0')
36+
library('lifecycle', "androidx.lifecycle:lifecycle-runtime-ktx:$jetpack_version")
37+
library('fragment', "androidx.navigation:navigation-fragment:$jetpack_version")
38+
library('navigation', "androidx.navigation:navigation-ui:$jetpack_version")
39+
library('material', 'com.google.android.material:material:1.8.0')
40+
library('constraint', "androidx.constraintlayout:constraintlayout:2.1.4")
41+
library('coordinatorlayout', "androidx.coordinatorlayout:coordinatorlayout:1.2.0")
42+
library('vp2', "androidx.viewpager2:viewpager2:1.0.0")
43+
library('cardview', "androidx.cardview:cardview:1.0.0")
44+
library('preferences', "androidx.datastore:datastore-preferences:1.0.0")
45+
library('preferences_core', "androidx.datastore:datastore-preferences-core:1.0.0")
46+
}
47+
48+
google {
49+
library('services', 'com.google.gms:google-services:4.3.15')
50+
library('play_services_base', 'com.google.android.gms:play-services-base:18.1.0')
51+
}
52+
53+
ui {
54+
library('fastadapter', "com.mikepenz:fastadapter:${latestFastAdapterRelease}")
55+
library('fastadapter_binding', "com.mikepenz:fastadapter-extensions-binding:${latestFastAdapterRelease}") // view binding helpers
56+
library('imageview', 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0')
57+
library('fastscroll', "me.zhanghai.android.fastscroll:library:1.2.0")
58+
59+
}
60+
61+
fb {
62+
library('firebase_messaging', "com.google.firebase:firebase-messaging:23.1.2")
63+
library('firebase_iid', "com.google.firebase:firebase-iid:21.1.0")
64+
}
65+
66+
signing {
67+
library('pkix', 'com.madgag.spongycastle:pkix:1.54.0.0')
68+
library('spongy_core', 'com.madgag.spongycastle:core:1.58.0.0')
69+
library('spongy_prov', 'com.madgag.spongycastle:prov:1.58.0.0')
70+
}
71+
72+
misc {
73+
library('simple_xml', 'org.simpleframework:simple-xml:2.7.1')
74+
library('leaks', 'com.squareup.leakcanary:leakcanary-android:2.9.1')
75+
library('commons_cli', 'commons-cli:commons-cli:1.5.0')
76+
library('commons_lang', "org.apache.commons:commons-lang3:3.12.0")
77+
library('commons_io', "commons-io:commons-io:2.11.0")
78+
library('commons_text', "org.apache.commons:commons-text:1.9")
79+
library('guava', 'com.google.guava:guava:31.0.1-android')
80+
library('antlr', "org.antlr:antlr-runtime:3.5.2")
81+
library('annotations', 'org.jetbrains:annotations:24.0.0')
82+
library('annotations_android', 'androidx.annotation:annotation:1.5.0')
83+
library('coroutines_core', "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
84+
library('coroutines_java', "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.1")
85+
library('net', 'com.squareup.okhttp3:okhttp:4.10.0')
86+
library('gson', 'com.google.code.gson:gson:2.10.1')
87+
library('util_codex', 'com.blankj:utilcodex:1.30.6')
88+
library('httpclient', 'org.apache.httpcomponents:httpclient:4.5.14')
89+
library('httpmime', 'org.apache.httpcomponents:httpmime:4.5.14')
90+
}
91+
}
1692
}
1793

1894
include ':app'

‎xbox/build.gradle‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,28 +30,30 @@ android {
3030

3131
dependencies {
3232
implementation project(':adal')
33-
implementation 'androidx.browser:browser:1.5.0'
34-
implementation 'androidx.appcompat:appcompat:1.6.1'
35-
implementation 'com.google.code.gson:gson:2.10.1'
36-
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
37-
implementation 'org.jetbrains:annotations:24.0.1'
38-
implementation 'com.google.android.material:material:1.8.0'
3933

40-
implementation 'com.google.firebase:firebase-messaging:23.1.2'
41-
implementation 'com.google.firebase:firebase-iid:21.1.0'
42-
runtimeOnly 'com.google.gms:google-services:4.3.15'
34+
implementation jetpack.appcompat
35+
implementation jetpack.material
36+
implementation jetpack.browser
4337

38+
implementation fb.firebase.messaging
39+
implementation fb.firebase.iid
40+
41+
implementation signing.pkix
42+
43+
implementation misc.gson
44+
implementation misc.net
4445
//noinspection DuplicatePlatformClasses
45-
implementation 'org.apache.httpcomponents:httpclient:4.5.14'
46-
implementation 'org.apache.httpcomponents:httpmime:4.5.14'
47-
implementation 'org.simpleframework:simple-xml:2.7.1'
48-
implementation 'com.squareup.okhttp3:okhttp:4.9.3'
46+
implementation misc.httpclient
47+
implementation misc.httpmime
48+
implementation misc.annotations
49+
implementation misc.annotations.android
50+
implementation misc.simple.xml
4951

5052
// Architectural Components
51-
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
52-
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
53-
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
54-
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
53+
implementation jetpack.mvvm.viewmodel
54+
implementation jetpack.mvvm.runtime
55+
implementation jetpack.mvvm.livedata
56+
implementation jetpack.mvvm.extensions
5557

56-
implementation 'com.madgag.spongycastle:pkix:1.54.0.0'
58+
runtimeOnly google.services
5759
}

0 commit comments

Comments
 (0)