Upgrade some dependencies versions

This commit is contained in:
Schoumi 2019-01-09 16:42:55 +01:00
parent 043ba6ab7a
commit cb23f90b9c
5 changed files with 21 additions and 19 deletions

View File

@ -7,16 +7,16 @@ android:
- platform-tools - platform-tools
- tools - tools
- build-tools-27.0.3 - build-tools-28.0.3
- android-27 - android-28
- extra-m2-repository - extra-m2-repository
- sys-img-armeabi-v7a-android-27 - sys-img-armeabi-v7a-android-28
before_script: before_script:
- mkdir "$ANDROID_HOME/licenses" || true - mkdir "$ANDROID_HOME/licenses" || true
- echo -e "\nd56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license" - echo -e "\nd56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license"
- touch empty.file - touch empty.file
- gradle wrapper --gradle-version 4.1 -b empty.file - gradle wrapper --gradle-version 4.6 -b empty.file
- rm empty.file - rm empty.file
script: script:

View File

@ -1,12 +1,12 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
compileSdkVersion 27 compileSdkVersion 28
buildToolsVersion "27.0.3" buildToolsVersion "28.0.3"
defaultConfig { defaultConfig {
applicationId "org.eu.exodus_privacy.exodusprivacy" applicationId "org.eu.exodus_privacy.exodusprivacy"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 27 targetSdkVersion 28
versionCode 5 versionCode 5
versionName "1.1.0" versionName "1.1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@ -30,13 +30,14 @@ android {
} }
dependencies { dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs') implementation fileTree(include: ['*.jar'], dir: 'libs')
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations' exclude group: 'com.android.support', module: 'support-annotations'
}) })
compile 'com.android.support:appcompat-v7:27.1.1' implementation 'com.android.support:appcompat-v7:28.0.0'
compile 'com.android.support.constraint:constraint-layout:1.1.3' implementation 'com.android.support:support-v4:28.0.0'
compile 'com.android.support:design:27.1.1' implementation 'com.android.support.constraint:constraint-layout:1.1.3'
compile 'com.android.support:recyclerview-v7:27.1.1' implementation 'com.android.support:design:28.0.0'
testCompile 'junit:junit:4.12' implementation 'com.android.support:recyclerview-v7:28.0.0'
testImplementation 'junit:junit:4.12'
} }

View File

@ -161,8 +161,9 @@ public class AppListFragment extends Fragment {
this.onAppClickListener = onAppClickListener; this.onAppClickListener = onAppClickListener;
} }
@Override @Override
public void onAttach(Context context) { public void onAttach(Activity context) {
super.onAttach(context); super.onAttach(context);
packageManager = context.getPackageManager(); packageManager = context.getPackageManager();
} }

View File

@ -8,7 +8,7 @@ buildscript {
} }
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.0.1' classpath 'com.android.tools.build:gradle:3.2.1'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

View File

@ -1,7 +1,7 @@
#Sun Dec 03 16:44:03 CET 2017 #Wed Jan 09 15:53:32 CET 2019
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
distributionSha256Sum=5c07b3bac2209fbc98fb1fdf6fd831f72429cdf8c503807404eae03d8c8099e5 distributionSha256Sum=9af7345c199f1731c187c96d3fe3d31f5405192a42046bafa71d846c3d9adacb