msfjarvis/compose-lobsters
1
Fork 0
mirror of https://github.com/msfjarvis/compose-lobsters synced 2025-08-17 22:37:03 +05:30
Code Issues Projects Releases Packages Wiki Activity Actions

build: update all dependencies

Browse source 
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
Harsh Shandilya 2020-10-02 04:40:59 +05:30
parent bab3a53a53
commit a2eb97e504
No known key found for this signature in database
GPG key ID: 366D7BBAD1031E80
4 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

32
app/build.gradle
View file

@ -1,12 +1,12 @@
plugins { plugins {
id 'kotlin-kapt' id "kotlin-kapt"
id 'dagger.hilt.android.plugin' id "dagger.hilt.android.plugin"
} }
final def keystorePropertiesFile = rootProject.file("keystore.properties") final def keystorePropertiesFile = rootProject.file("keystore.properties")
android { android {
adbOptions { adbOptions {
installOptions = ['--user 0'] installOptions = ["--user 0"]
} }
defaultConfig { defaultConfig {
applicationId "dev.msfjarvis.lobsters" applicationId "dev.msfjarvis.lobsters"
@ -16,7 +16,7 @@ android {
buildTypes { buildTypes {
release { release {
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
} }
} }
@ -35,10 +35,10 @@ android {
signingConfigs { signingConfigs {
release { release {
keyAlias keystoreProperties['keyAlias'] keyAlias keystoreProperties["keyAlias"]
keyPassword keystoreProperties['keyPassword'] keyPassword keystoreProperties["keyPassword"]
storeFile rootProject.file(keystoreProperties['storeFile']) storeFile rootProject.file(keystoreProperties["storeFile"])
storePassword keystoreProperties['storePassword'] storePassword keystoreProperties["storePassword"]
} }
} }
buildTypes.debug.signingConfig = signingConfigs.release buildTypes.debug.signingConfig = signingConfigs.release
@ -59,21 +59,21 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
dependencies { dependencies {
kapt "com.google.dagger:hilt-android-compiler:$hilt_dagger_version" kapt "com.google.dagger:hilt-compiler:$hilt_dagger_version"
kapt "androidx.hilt:hilt-compiler:$hilt_androidx_version" kapt "androidx.hilt:hilt-compiler:$hilt_androidx_version"
implementation(project(":data")) implementation(project(":data"))
implementation(project(":lobsters-api")) implementation(project(":lobsters-api"))
implementation(project(":model")) implementation(project(":model"))
implementation 'androidx.core:core-ktx:1.5.0-alpha03' implementation "androidx.core:core-ktx:1.5.0-alpha04"
implementation 'androidx.activity:activity-ktx:1.2.0-alpha08' implementation "androidx.activity:activity-ktx:1.2.0-beta01"
implementation 'androidx.appcompat:appcompat:1.3.0-alpha02' implementation "androidx.appcompat:appcompat:1.3.0-alpha02"
implementation "androidx.browser:browser:1.2.0" implementation "androidx.browser:browser:1.3.0-alpha06"
implementation "androidx.compose.foundation:foundation:$compose_version" implementation "androidx.compose.foundation:foundation:$compose_version"
implementation "androidx.compose.foundation:foundation-layout:$compose_version" implementation "androidx.compose.foundation:foundation-layout:$compose_version"
implementation "androidx.compose.foundation:foundation-text:$compose_version" implementation "androidx.compose.foundation:foundation-text:$compose_version"
implementation "androidx.compose.runtime:runtime:$compose_version" implementation "androidx.compose.runtime:runtime:$compose_version"
implementation "androidx.compose.material:material:$compose_version" implementation "androidx.compose.material:material:$compose_version"
implementation "androidx.compose:compose-compiler:$compose_version" implementation "androidx.compose.compiler:compiler:$compose_version"
implementation "androidx.compose.ui:ui:$compose_version" implementation "androidx.compose.ui:ui:$compose_version"
implementation "androidx.compose.ui:ui-text:$compose_version" implementation "androidx.compose.ui:ui-text:$compose_version"
implementation "androidx.compose.ui:ui-text-android:$compose_version" implementation "androidx.compose.ui:ui-text-android:$compose_version"
@ -82,12 +82,12 @@ dependencies {
implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
implementation "androidx.ui:ui-tooling:$compose_version" implementation "androidx.ui:ui-tooling:$compose_version"
implementation 'com.google.android.material:material:1.3.0-alpha02' implementation "com.google.android.material:material:1.3.0-alpha02"
implementation "com.google.dagger:hilt-android:$hilt_dagger_version" implementation "com.google.dagger:hilt-android:$hilt_dagger_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
implementation "saschpe.android:customtabs:3.0.2" implementation "saschpe.android:customtabs:3.0.2"
androidTestImplementation "com.google.dagger:hilt-android-testing:$hilt_dagger_version" androidTestImplementation "com.google.dagger:hilt-android-testing:$hilt_dagger_version"
testImplementation 'junit:junit:4.13' testImplementation "junit:junit:4.13"
androidTestImplementation "androidx.ui:ui-test:$compose_version" androidTestImplementation "androidx.ui:ui-test:$compose_version"
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.0.10" coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.0.10"
} }

2
app/src/main/java/dev/msfjarvis/lobsters/urllauncher/UrlLauncherImpl.kt
View file

@ -9,7 +9,7 @@ import saschpe.android.customtabs.WebViewFallback
class UrlLauncherImpl(private val context: Context) : UrlLauncher { class UrlLauncherImpl(private val context: Context) : UrlLauncher {
override fun launch(url: String) { override fun launch(url: String) {
val customTabsIntent = CustomTabsIntent.Builder() val customTabsIntent = CustomTabsIntent.Builder()
.addDefaultShareMenuItem() .setShareState(CustomTabsIntent.SHARE_STATE_ON)
.setShowTitle(true) .setShowTitle(true)
.build() .build()
CustomTabsHelper.addKeepAliveExtra(context, customTabsIntent.intent) CustomTabsHelper.addKeepAliveExtra(context, customTabsIntent.intent)

32
build.gradle
View file

@ -1,22 +1,22 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext { ext {
compose_version = '1.0.0-alpha03' compose_version = "1.0.0-alpha04"
coroutines_version = '1.3.9' coroutines_version = "1.3.9"
dagger_version = '2.29.1' dagger_version = "2.29.1"
hilt_androidx_version = '1.0.0-alpha02' hilt_androidx_version = "1.0.0-alpha02"
hilt_dagger_version = '2.29-alpha' hilt_dagger_version = "2.29.1-alpha"
kotlin_version = '1.4.10' kotlin_version = "1.4.10"
lifecycle_version = '2.3.0-alpha07' lifecycle_version = "2.3.0-beta01"
moshi_version = '1.9.3' moshi_version = "1.9.3"
room_version = '2.3.0-alpha02' room_version = "2.3.0-alpha02"
} }
repositories { repositories {
google() google()
jcenter() jcenter()
} }
dependencies { dependencies {
classpath "com.android.tools.build:gradle:4.2.0-alpha12" classpath "com.android.tools.build:gradle:4.2.0-alpha13"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_dagger_version" classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_dagger_version"
} }
@ -34,12 +34,12 @@ subprojects {
google() google()
jcenter() jcenter()
} }
if (name == 'app') { if (name == "app") {
apply plugin: 'com.android.application' apply plugin: "com.android.application"
} else { } else {
apply plugin: 'com.android.library' apply plugin: "com.android.library"
} }
apply plugin: 'kotlin-android' apply plugin: "kotlin-android"
android { android {
compileSdkVersion 30 compileSdkVersion 30
@ -63,7 +63,7 @@ subprojects {
} }
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
kotlinOptions { kotlinOptions {
jvmTarget = '1.8' jvmTarget = "1.8"
} }
} }
} }
@ -74,7 +74,7 @@ task clean(type: Delete) {
tasks { tasks {
wrapper { wrapper {
gradleVersion = "6.7-rc-2" gradleVersion = "6.7-rc-3"
distributionType = Wrapper.DistributionType.ALL distributionType = Wrapper.DistributionType.ALL
} }
} }

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-rc-2-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-rc-3-all.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists