mirror of
https://github.com/sudoxnym/habitica-android.git
synced 2026-05-21 13:19:02 +00:00
bump dependencies
This commit is contained in:
Phillip Thelen
parent
ec05373711
commit
9923f9c7f3
8 changed files with 40 additions and 22 deletions
|
|
@ -46,12 +46,12 @@ dependencies {
|
|||
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
|
||||
|
||||
//Desugaring
|
||||
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.2'
|
||||
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
|
||||
|
||||
implementation('com.jaredrummler:android-device-names:2.1.1')
|
||||
|
||||
// IAP Handling / Verification
|
||||
implementation "com.android.billingclient:billing-ktx:5.1.0"
|
||||
implementation "com.android.billingclient:billing-ktx:5.2.0"
|
||||
implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1@aar'
|
||||
|
||||
implementation("io.coil-kt:coil-compose:$coil_version")
|
||||
|
|
@ -73,7 +73,7 @@ dependencies {
|
|||
|
||||
androidTestImplementation 'androidx.test:runner:1.5.2'
|
||||
androidTestImplementation 'androidx.test:rules:1.5.0'
|
||||
debugImplementation 'androidx.fragment:fragment-testing:1.5.6'
|
||||
debugImplementation 'androidx.fragment:fragment-testing:1.5.7'
|
||||
androidTestImplementation 'androidx.test:core-ktx:1.5.0'
|
||||
debugImplementation "androidx.test:monitor:1.6.1"
|
||||
androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.5'
|
||||
|
|
@ -95,7 +95,7 @@ dependencies {
|
|||
implementation 'com.google.firebase:firebase-messaging-ktx'
|
||||
implementation 'com.google.firebase:firebase-config-ktx'
|
||||
implementation 'com.google.firebase:firebase-perf-ktx'
|
||||
implementation 'com.google.android.gms:play-services-ads:21.5.0'
|
||||
implementation 'com.google.android.gms:play-services-ads:22.0.0'
|
||||
implementation "com.google.android.gms:play-services-auth:$play_auth_version"
|
||||
implementation 'com.google.android.flexbox:flexbox:3.0.0'
|
||||
implementation "com.google.android.gms:play-services-wearable:$play_wearables_version"
|
||||
|
|
@ -106,7 +106,7 @@ dependencies {
|
|||
implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
|
||||
implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
|
||||
implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
|
||||
implementation "androidx.fragment:fragment-ktx:1.5.6"
|
||||
implementation "androidx.fragment:fragment-ktx:1.5.7"
|
||||
implementation "androidx.paging:paging-runtime-ktx:3.1.1"
|
||||
implementation "androidx.paging:paging-compose:1.0.0-alpha18"
|
||||
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
|
||||
|
|
@ -115,9 +115,9 @@ dependencies {
|
|||
implementation "androidx.compose.material3:material3:1.0.1"
|
||||
implementation "com.google.accompanist:accompanist-systemuicontroller:$accompanist_version"
|
||||
|
||||
implementation 'androidx.activity:activity-compose:1.7.0'
|
||||
implementation 'androidx.activity:activity-compose:1.7.1'
|
||||
implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
|
||||
implementation "androidx.compose.material:material:1.4.0"
|
||||
implementation "androidx.compose.material:material:1.4.2"
|
||||
implementation "androidx.compose.animation:animation:$compose_version"
|
||||
implementation "androidx.compose.ui:ui-text-google-fonts:$compose_version"
|
||||
implementation "androidx.compose.ui:ui-tooling:$compose_version"
|
||||
|
|
@ -138,13 +138,15 @@ android {
|
|||
animationsDisabled = true
|
||||
}
|
||||
|
||||
namespace "com.habitrpg.android.habitica"
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion min_sdk
|
||||
applicationId "com.habitrpg.android.habitica"
|
||||
vectorDrawables.useSupportLibrary = true
|
||||
buildConfigField "String", "STORE", "\"google\""
|
||||
buildConfigField "String", "TESTING_LEVEL", "\"production\""
|
||||
resConfigs 'en', 'bg', 'de', 'en-rGB', 'es', 'fr', 'hr-rHR', 'in', 'it', 'iw', 'ja', 'ko', 'lt', 'nl', 'pl', 'pt-rBR', 'pt-rPT', 'ru', 'tr', 'uk', 'zh', 'zh-rTW'
|
||||
resourceConfigurations += ['en', 'bg', 'de', 'en-rGB', 'es', 'fr', 'hr-rHR', 'in', 'it', 'iw', 'ja', 'ko', 'lt', 'nl', 'pl', 'pt-rBR', 'pt-rPT', 'ru', 'tr', 'uk', 'zh', 'zh-rTW']
|
||||
|
||||
versionCode app_version_code
|
||||
versionName app_version_name
|
||||
|
|
@ -161,6 +163,8 @@ android {
|
|||
buildFeatures {
|
||||
viewBinding true
|
||||
compose true
|
||||
renderScript true
|
||||
aidl true
|
||||
}
|
||||
|
||||
composeOptions {
|
||||
|
|
|
|||
|
|
@ -112,6 +112,17 @@
|
|||
android:textAllCaps="false"
|
||||
android:textSize="@dimen/card_medium_text" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/guidelines_button"
|
||||
android:layout_width="250dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_marginTop="8sp"
|
||||
style="@style/HabiticaButton.Gray"
|
||||
android:text="@string/community_guidelines"
|
||||
android:textAllCaps="false"
|
||||
android:textSize="@dimen/card_medium_text" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/googlePlayStoreButton"
|
||||
android:layout_width="250dp"
|
||||
|
|
@ -154,4 +165,4 @@
|
|||
android:textAllCaps="false"
|
||||
android:textSize="@dimen/card_medium_text" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
|
|
|
|||
|
|
@ -15,11 +15,10 @@ import com.habitrpg.android.habitica.R
|
|||
import com.habitrpg.android.habitica.databinding.FragmentAboutBinding
|
||||
import com.habitrpg.android.habitica.helpers.AppConfigManager
|
||||
import com.habitrpg.android.habitica.helpers.MainNavigationController
|
||||
import com.habitrpg.android.habitica.modules.AppModule
|
||||
import com.habitrpg.common.habitica.extensions.DataBindingUtils
|
||||
import com.plattysoft.leonids.ParticleSystem
|
||||
import javax.inject.Inject
|
||||
import dagger.hilt.android.AndroidEntryPoint
|
||||
import javax.inject.Inject
|
||||
|
||||
@AndroidEntryPoint
|
||||
class AboutFragment : BaseMainFragment<FragmentAboutBinding>() {
|
||||
|
|
@ -108,6 +107,7 @@ class AboutFragment : BaseMainFragment<FragmentAboutBinding>() {
|
|||
|
||||
binding?.privacyPolicyButton?.setOnClickListener { openBrowserLink(privacyPolicyLink) }
|
||||
binding?.termsButton?.setOnClickListener { openBrowserLink(termsLink) }
|
||||
binding?.guidelinesButton?.setOnClickListener { MainNavigationController.navigate(R.id.guidelinesActivity) }
|
||||
binding?.sourceCodeLink?.setOnClickListener { openBrowserLink(androidSourceCodeLink) }
|
||||
binding?.twitter?.setOnClickListener { openBrowserLink(twitterLink) }
|
||||
binding?.sourceCodeButton?.setOnClickListener { openBrowserLink(androidSourceCodeLink) }
|
||||
|
|
|
|||
14
build.gradle
14
build.gradle
|
|
@ -11,22 +11,22 @@ buildscript {
|
|||
amplitude_version = '1.6.1'
|
||||
appcompat_version = '1.6.1'
|
||||
coil_version = '2.2.2'
|
||||
compose_version = '1.4.0'
|
||||
core_ktx_version = '1.9.0'
|
||||
compose_version = '1.4.2'
|
||||
core_ktx_version = '1.10.0'
|
||||
coroutines_version = '1.6.4'
|
||||
daggerhilt_version = '2.44.2'
|
||||
firebase_bom = '31.3.0'
|
||||
kotest_version = '5.5.5'
|
||||
kotlin_version = '1.8.10'
|
||||
kotlin_version = '1.8.20'
|
||||
ktlint_version = '0.48.2'
|
||||
lifecycle_version = '2.6.0'
|
||||
lifecycle_version = '2.6.1'
|
||||
markwon_version = '4.6.2'
|
||||
mockk_version = '1.13.4'
|
||||
moshi_version = '1.14.0'
|
||||
navigation_version = '2.5.3'
|
||||
okhttp_version = '4.10.0'
|
||||
play_wearables_version = '18.0.0'
|
||||
play_auth_version = '20.4.1'
|
||||
play_auth_version = '20.5.0'
|
||||
preferences_version = '1.2.0'
|
||||
realm_version = '1.0.2'
|
||||
retrofit_version = '2.9.0'
|
||||
|
|
@ -39,10 +39,10 @@ buildscript {
|
|||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:7.4.2'
|
||||
classpath 'com.android.tools.build:gradle:8.0.0'
|
||||
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
|
||||
classpath 'com.google.gms:google-services:4.3.15'
|
||||
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.4'
|
||||
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
|
||||
classpath "io.realm:realm-gradle-plugin:10.13.2-transformer-api"
|
||||
classpath("io.realm.kotlin:gradle-plugin:$realm_version")
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||
|
|
|
|||
2
common/proguard-rules.pro
vendored
2
common/proguard-rules.pro
vendored
|
|
@ -1,6 +1,6 @@
|
|||
# Add project specific ProGuard rules here.
|
||||
# You can control the set of applied configuration files using the
|
||||
# proguardFiles setting in build.gradle.
|
||||
# proguardFiles setting in build.gradle.kts.
|
||||
#
|
||||
# For more details, see
|
||||
# http://developer.android.com/guide/developing/tools/proguard.html
|
||||
|
|
|
|||
|
|
@ -6,4 +6,7 @@ org.gradle.daemon=true
|
|||
org.gradle.jvmargs=-Xmx6656M
|
||||
org.gradle.warning.mode=all
|
||||
kotlin.mpp.stability.nowarn=true
|
||||
kotlin.mpp.androidSourceSetLayoutVersion=2
|
||||
kotlin.mpp.androidSourceSetLayoutVersion=2
|
||||
android.defaults.buildfeatures.buildconfig=true
|
||||
android.nonTransitiveRClass=false
|
||||
android.nonFinalResIds=false
|
||||
|
|
|
|||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
|
|
@ -1,6 +1,6 @@
|
|||
#Sun May 08 23:57:52 EDT 2022
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
|
||||
distributionPath=wrapper/dists
|
||||
zipStorePath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
NAME=4.2
|
||||
CODE=5871
|
||||
CODE=5881
|
||||
Loading…
Reference in a new issue