Skip to content

Commit

Permalink
Merge pull request #39 from eltos/oreo
Browse files Browse the repository at this point in the history
Update to Android Pie (API 28) closes #42
  • Loading branch information
eltos authored Aug 20, 2018
2 parents 5b30d3b + 5ceba40 commit 05b2146
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 21 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@

# SimpleDialogFragments

[![API 11+](https://img.shields.io/badge/API-11+-lightgrey.svg)](https://developer.android.com/about/dashboards/index.html#Platform)
[![API 14+](https://img.shields.io/badge/API-14+-green.svg)](https://developer.android.com/about/dashboards/index.html#Platform)
[![Download Latest](https://api.bintray.com/packages/eltos/simpledialogfragments/SimpleDialogFragment/images/download.svg)](https://bintray.com/eltos/simpledialogfragments/SimpleDialogFragment/_latestVersion)
[![JitPack](https://jitpack.io/v/eltos/SimpleDialogFragments.svg)](https://jitpack.io/#eltos/SimpleDialogFragments)
[![Code Climate Rating](https://codeclimate.com/github/eltos/SimpleDialogFragments/badges/gpa.svg)](https://codeclimate.com/github/eltos/SimpleDialogFragments)
[![Travis CI](https://travis-ci.org/eltos/SimpleDialogFragments.svg?branch=master)](https://travis-ci.org/eltos/SimpleDialogFragments)
[![License](https://img.shields.io/github/license/eltos/simpledialogfragments.svg)](https://github.com/eltos/SimpleDialogFragments#license)



Expand Down
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ buildscript {
gradlePluginVersion = '3.0.1' // <X>.<Y>.<Z>
lintVersion = '26.0.1' // <X+23>.<Y>.<Z>

buildToolsVersion = '27.0.3'
}
repositories {
google()
Expand Down
22 changes: 11 additions & 11 deletions simpledialogfragment/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 25
buildToolsVersion '27.0.3'
compileSdkVersion 28
buildToolsVersion '28.0.2'

defaultConfig {
minSdkVersion 11
targetSdkVersion 25
versionCode 240
versionName "2.4"
minSdkVersion 14
targetSdkVersion 28
versionCode 300
versionName '3.0'
}
buildTypes {
release {
Expand All @@ -22,10 +22,10 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:25.1.1'
compile 'com.android.support:design:25.1.1'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
compile 'com.alimuzaffar.lib:pinentryedittext:1.3.3'
implementation 'com.android.support:appcompat-v7:28.0.0-rc01'
implementation 'com.android.support:design:28.0.0-rc01'
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
implementation 'com.alimuzaffar.lib:pinentryedittext:1.3.3'
lintChecks project(':lintchecks')
}

Expand All @@ -46,7 +46,7 @@ ext {
gitUrl = 'https://github.com/eltos/SimpleDialogFragments.git'
githubRepository= 'eltos/SimpleDialogFragments'

libraryVersion = '2.4'
libraryVersion = '3.0'

developerId = 'eltos'
developerName = 'Philipp Niedermayer'
Expand Down
16 changes: 8 additions & 8 deletions testApp/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 25
buildToolsVersion '27.0.3'
compileSdkVersion 28
buildToolsVersion '28.0.2'

defaultConfig {
applicationId "eltos.simpledialogfragments.test"
applicationId 'eltos.simpledialogfragments.test'
minSdkVersion 14
targetSdkVersion 25
versionCode 240
versionName "2.4"
targetSdkVersion 28
versionCode 300
versionName '3.0'
}
buildTypes {
release {
Expand All @@ -22,7 +22,7 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:25.1.1'
compile 'com.google.zxing:core:3.2.0'
compile 'com.android.support:appcompat-v7:28.0.0-rc01'
compile 'com.google.zxing:core:3.3.3'
compile project(path: ':simpledialogfragment')
}

0 comments on commit 05b2146

Please sign in to comment.