Skip to content

Commit

Permalink
Upgrade to Android API 29
Browse files Browse the repository at this point in the history
  • Loading branch information
scheibler committed May 31, 2020
1 parent 64aa2d8 commit cb800e0
Show file tree
Hide file tree
Showing 25 changed files with 97 additions and 311 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,8 @@ proguard/
/out/
/captures


# un-ignore
#
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!gradle-wrapper.jar
40 changes: 19 additions & 21 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,23 @@ if (keystoreProperties.isEmpty()) {
}

android {
compileSdkVersion 27
buildToolsVersion "27.0.2"
compileSdkVersion 29
buildToolsVersion "29.0.2"

compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
}

defaultConfig {
applicationId "de.eric_scheibler.tactileclock"
minSdkVersion 16
targetSdkVersion 27
versionCode 6
versionName '2.0.1'
targetSdkVersion 29
resConfigs "en", "de"
versionCode 7
versionName '2.0.2'
// set .apk name
setProperty("archivesBaseName", "${archivesBaseName}-$versionName")
}

signingConfigs {
Expand All @@ -44,28 +52,18 @@ android {
release {
signingConfig signingConfigs.release
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
}

lintOptions {
baseline file("lint-baseline.xml")
disable "StaticFieldLeak", "InflateParams", "GoogleAppIndexingWarning",
"ButtonStyle", "UseSparseArrays", "UseCompoundDrawables",
"DefaultLocale", "AllowBackup", "IconLauncherShape", "Autofill", "GradleCompatible"
}
}

dependencies {
compile 'com.android.support:design:27.0.2'
compile 'com.google.guava:guava:20.0'
}

// REQUIRED: Google's new Maven repo is required for the latest
// support library that is compatible with Android 8.0
repositories {
// gradle version >= 4.1
// google()
//
// If you're using a version of Gradle lower than 4.1, you must instead use:
maven {
url 'https://maven.google.com'
}
//implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.android.support:design:28.0.0'
implementation 'com.google.guava:guava:28.2-android'
}
237 changes: 0 additions & 237 deletions app/lint-baseline.xml

This file was deleted.

4 changes: 0 additions & 4 deletions app/lint.xml

This file was deleted.

2 changes: 2 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
package="de.eric_scheibler.tactileclock" >

<!-- permissions -->
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" android:minSdkVersion="28" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.VIBRATE" />

<application
android:allowBackup="true"
android:supportsRtl="false"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme"
Expand Down
10 changes: 8 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,22 @@

buildscript {
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.1'
classpath 'com.cesarferreira:android-rocket-launcher:0.2.3'
classpath 'com.android.tools.build:gradle:3.5.0'
classpath 'com.cesarferreira:android-rocket-launcher:0.9.1'
}
}

allprojects {
repositories {
google()
jcenter()
}
// enable compiler warnings
//tasks.withType(JavaCompile) {
// options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
//}
}
Binary file added gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
11 changes: 5 additions & 6 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Mon Apr 24 20:16:12 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit cb800e0

Please sign in to comment.