Skip to content

Commit

Permalink
Merge pull request #11 from fatihkizmaz/master
Browse files Browse the repository at this point in the history
Support Older Apis + Migrate AndroidX + Upgrade CompileSDK
  • Loading branch information
erkutaras authored Dec 13, 2018
2 parents 4dd3984 + 646f69e commit e54d7f6
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 15 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ allprojects {
**Step 2.** Add the library dependency to your project build.gradle:
```
dependencies {
implementation 'com.github.erkutaras:StateLayout:1.1.2'
implementation 'com.github.erkutaras:StateLayout:1.1.3'
}
```

Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
# 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.
android.enableJetifier=true
android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
Expand Down
12 changes: 6 additions & 6 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ apply plugin: 'com.github.dcendents.android-maven'
group='com.erkutaras.statelayout'

android {
compileSdkVersion 27
compileSdkVersion 28

defaultConfig {
minSdkVersion 17
targetSdkVersion 27
versionCode 13
versionName "1.1.2"
minSdkVersion 14
targetSdkVersion 28
versionCode 14
versionName "1.1.3"

vectorDrawables.useSupportLibrary = true
}
Expand All @@ -27,7 +27,7 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
repositories {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.erkutaras.statelayout

import android.content.Context
import android.support.annotation.LayoutRes
import androidx.annotation.LayoutRes
import android.util.AttributeSet
import android.view.LayoutInflater
import android.view.View
Expand Down
8 changes: 4 additions & 4 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ android {
compileSdkVersion 28
defaultConfig {
applicationId "com.erkutaras.statelayout.sample"
minSdkVersion 17
minSdkVersion 14
targetSdkVersion 28
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
Expand All @@ -26,6 +26,6 @@ dependencies {
implementation project(':library')
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package com.erkutaras.statelayout.sample

import android.graphics.Bitmap
import android.os.Bundle
import android.support.v7.app.AppCompatActivity
import androidx.appcompat.app.AppCompatActivity
import android.webkit.WebResourceError
import android.webkit.WebResourceRequest
import android.webkit.WebView
Expand Down
4 changes: 2 additions & 2 deletions sample/src/main/res/layout/activity_state_layout_sample.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
Expand All @@ -22,4 +22,4 @@

</com.erkutaras.statelayout.StateLayout>

</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

0 comments on commit e54d7f6

Please sign in to comment.