[go: up one dir, main page]

Skip to content

Commit

Permalink
update gradle + layout behavior
Browse files Browse the repository at this point in the history
  • Loading branch information
Externius committed Aug 27, 2018
1 parent 0d4d151 commit adc6340
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
18 changes: 9 additions & 9 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 27
buildToolsVersion '27.0.3'
compileSdkVersion 28
buildToolsVersion '28.0.2'
defaultConfig {
applicationId "externius.rdmg"
minSdkVersion 19
targetSdkVersion 27
versionCode 25
versionName '1.0.21'
targetSdkVersion 28
versionCode 26
versionName '1.0.22'
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
Expand All @@ -33,15 +33,15 @@ android {

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
androidTestImplementation 'com.android.support:support-annotations:27.1.1'
androidTestImplementation 'com.android.support:support-annotations:28.0.0-rc01'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test:rules:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3'
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support.constraint:constraint-layout:1.1.0'
implementation 'com.android.support:design:27.1.1'
implementation 'com.android.support:appcompat-v7:28.0.0-rc01'
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
implementation 'com.android.support:design:28.0.0-rc01'
testImplementation 'junit:junit:4.12'
implementation 'org.hamcrest:hamcrest-library:1.3'
implementation 'com.google.code.gson:gson:2.8.2'
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/content_about.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
app:layout_behavior="android.support.design.widget.AppBarLayout$ScrollingViewBehavior"
tools:context="externius.rdmg.activities.AboutActivity"
tools:showIn="@layout/activity_about">

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/content_dungeon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
app:layout_behavior="android.support.design.widget.AppBarLayout$ScrollingViewBehavior"
tools:context="externius.rdmg.activities.DungeonActivity"
tools:showIn="@layout/activity_dungeon"
android:fillViewport="true">
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.2'
classpath 'com.android.tools.build:gradle:3.1.4'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down

0 comments on commit adc6340

Please sign in to comment.