diff --git a/app/build.gradle b/app/build.gradle index 9013e3e6..5113aebc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,12 @@ plugins { - id 'kotlin-kapt' - id 'dagger.hilt.android.plugin' + id "kotlin-kapt" + id "dagger.hilt.android.plugin" } final def keystorePropertiesFile = rootProject.file("keystore.properties") android { adbOptions { - installOptions = ['--user 0'] + installOptions = ["--user 0"] } defaultConfig { applicationId "dev.msfjarvis.lobsters" @@ -16,7 +16,7 @@ android { buildTypes { release { 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 { release { - keyAlias keystoreProperties['keyAlias'] - keyPassword keystoreProperties['keyPassword'] - storeFile rootProject.file(keystoreProperties['storeFile']) - storePassword keystoreProperties['storePassword'] + keyAlias keystoreProperties["keyAlias"] + keyPassword keystoreProperties["keyPassword"] + storeFile rootProject.file(keystoreProperties["storeFile"]) + storePassword keystoreProperties["storePassword"] } } buildTypes.debug.signingConfig = signingConfigs.release @@ -59,21 +59,21 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { 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" implementation(project(":data")) implementation(project(":lobsters-api")) implementation(project(":model")) - implementation 'androidx.core:core-ktx:1.5.0-alpha03' - implementation 'androidx.activity:activity-ktx:1.2.0-alpha08' - implementation 'androidx.appcompat:appcompat:1.3.0-alpha02' - implementation "androidx.browser:browser:1.2.0" + implementation "androidx.core:core-ktx:1.5.0-alpha04" + implementation "androidx.activity:activity-ktx:1.2.0-beta01" + implementation "androidx.appcompat:appcompat:1.3.0-alpha02" + implementation "androidx.browser:browser:1.3.0-alpha06" implementation "androidx.compose.foundation:foundation:$compose_version" implementation "androidx.compose.foundation:foundation-layout:$compose_version" implementation "androidx.compose.foundation:foundation-text:$compose_version" implementation "androidx.compose.runtime:runtime:$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-text:$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-viewmodel-ktx:$lifecycle_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 "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version" implementation "saschpe.android:customtabs:3.0.2" 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" coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.0.10" } diff --git a/app/src/main/java/dev/msfjarvis/lobsters/urllauncher/UrlLauncherImpl.kt b/app/src/main/java/dev/msfjarvis/lobsters/urllauncher/UrlLauncherImpl.kt index d331b805..59306216 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/urllauncher/UrlLauncherImpl.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/urllauncher/UrlLauncherImpl.kt @@ -9,7 +9,7 @@ import saschpe.android.customtabs.WebViewFallback class UrlLauncherImpl(private val context: Context) : UrlLauncher { override fun launch(url: String) { val customTabsIntent = CustomTabsIntent.Builder() - .addDefaultShareMenuItem() + .setShareState(CustomTabsIntent.SHARE_STATE_ON) .setShowTitle(true) .build() CustomTabsHelper.addKeepAliveExtra(context, customTabsIntent.intent) diff --git a/build.gradle b/build.gradle index f015fb1e..9130f2a1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,22 +1,22 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { ext { - compose_version = '1.0.0-alpha03' - coroutines_version = '1.3.9' - dagger_version = '2.29.1' - hilt_androidx_version = '1.0.0-alpha02' - hilt_dagger_version = '2.29-alpha' - kotlin_version = '1.4.10' - lifecycle_version = '2.3.0-alpha07' - moshi_version = '1.9.3' - room_version = '2.3.0-alpha02' + compose_version = "1.0.0-alpha04" + coroutines_version = "1.3.9" + dagger_version = "2.29.1" + hilt_androidx_version = "1.0.0-alpha02" + hilt_dagger_version = "2.29.1-alpha" + kotlin_version = "1.4.10" + lifecycle_version = "2.3.0-beta01" + moshi_version = "1.9.3" + room_version = "2.3.0-alpha02" } repositories { google() jcenter() } 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 "com.google.dagger:hilt-android-gradle-plugin:$hilt_dagger_version" } @@ -34,12 +34,12 @@ subprojects { google() jcenter() } - if (name == 'app') { - apply plugin: 'com.android.application' + if (name == "app") { + apply plugin: "com.android.application" } else { - apply plugin: 'com.android.library' + apply plugin: "com.android.library" } - apply plugin: 'kotlin-android' + apply plugin: "kotlin-android" android { compileSdkVersion 30 @@ -63,7 +63,7 @@ subprojects { } tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { kotlinOptions { - jvmTarget = '1.8' + jvmTarget = "1.8" } } } @@ -74,7 +74,7 @@ task clean(type: Delete) { tasks { wrapper { - gradleVersion = "6.7-rc-2" + gradleVersion = "6.7-rc-3" distributionType = Wrapper.DistributionType.ALL } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 17f4cffb..8dbe2cd2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME 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 zipStorePath=wrapper/dists