Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Apdate to AGP 4.2c3.
Also removed some rogue gradle files.

Change-Id: If4c0b603cf21e077d639682e0d29c8c7e4df981d
  • Loading branch information
nickbutcher committed Jul 2, 2020
commit 1accb58cd0c38626fc823850643589462ced485f
6 changes: 3 additions & 3 deletions JetNews/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'

android {
compileSdkVersion 29
compileSdkVersion 30
defaultConfig {
applicationId 'com.example.jetnews'
minSdkVersion 21
targetSdkVersion 29
targetSdkVersion 30
versionCode 1
versionName '1.0'
vectorDrawables.useSupportLibrary = true
Expand Down Expand Up @@ -77,7 +77,7 @@ dependencies {

implementation "androidx.ui:ui-livedata:$compose_version"

implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.0-alpha04"
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.0-alpha05"

androidTestImplementation 'junit:junit:4.13'
androidTestImplementation 'androidx.test:rules:1.2.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import androidx.ui.core.Alignment
import androidx.ui.core.Modifier
import androidx.ui.foundation.Image
import androidx.ui.foundation.Text
import androidx.ui.graphics.Color
import androidx.ui.graphics.ColorFilter
import androidx.ui.graphics.vector.VectorAsset
import androidx.ui.layout.Arrangement
Expand Down Expand Up @@ -162,7 +163,7 @@ private fun DrawerButton(
val backgroundColor = if (isSelected) {
colors.primary.copy(alpha = 0.12f)
} else {
colors.surface
Color.Transparent
}

val surfaceModifier = modifier
Expand Down
2 changes: 1 addition & 1 deletion JetNews/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.0-alpha02'
classpath 'com.android.tools.build:gradle:4.2.0-alpha03'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
29 changes: 17 additions & 12 deletions JetNews/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
## For more details on how to configure your build environment visit
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
#

# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx1024m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
#
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
#Thu Apr 02 12:49:33 CEST 2020
android.enableJetifier=true
org.gradle.jvmargs=-Xmx2048m

org.gradle.configureondemand=true
org.gradle.caching=true
org.gradle.parallel=true

# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app's APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true

# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
Binary file removed gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 0 additions & 6 deletions gradle/wrapper/gradle-wrapper.properties

This file was deleted.

172 changes: 0 additions & 172 deletions gradlew

This file was deleted.

84 changes: 0 additions & 84 deletions gradlew.bat

This file was deleted.