diff --git a/.travis.yml b/.travis.yml index 0615af9..9eaa8d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,16 +7,16 @@ android: - platform-tools - tools - - build-tools-27.0.3 - - android-27 + - build-tools-28.0.3 + - android-28 - extra-m2-repository - - sys-img-armeabi-v7a-android-27 + - sys-img-armeabi-v7a-android-28 before_script: - mkdir "$ANDROID_HOME/licenses" || true - echo -e "\nd56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license" - touch empty.file - - gradle wrapper --gradle-version 4.1 -b empty.file + - gradle wrapper --gradle-version 4.6 -b empty.file - rm empty.file script: diff --git a/app/build.gradle b/app/build.gradle index 93300aa..0e0f467 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 - buildToolsVersion "27.0.3" + compileSdkVersion 28 + buildToolsVersion "28.0.3" defaultConfig { applicationId "org.eu.exodus_privacy.exodusprivacy" minSdkVersion 16 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 5 versionName "1.1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -30,13 +30,14 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(include: ['*.jar'], dir: 'libs') + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:27.1.1' - compile 'com.android.support.constraint:constraint-layout:1.1.3' - compile 'com.android.support:design:27.1.1' - compile 'com.android.support:recyclerview-v7:27.1.1' - testCompile 'junit:junit:4.12' + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support:support-v4:28.0.0' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'com.android.support:design:28.0.0' + implementation 'com.android.support:recyclerview-v7:28.0.0' + testImplementation 'junit:junit:4.12' } diff --git a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/AppListFragment.java b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/AppListFragment.java index 479e801..fc77a82 100644 --- a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/AppListFragment.java +++ b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/AppListFragment.java @@ -161,8 +161,9 @@ public class AppListFragment extends Fragment { this.onAppClickListener = onAppClickListener; } + @Override - public void onAttach(Context context) { + public void onAttach(Activity context) { super.onAttach(context); packageManager = context.getPackageManager(); } diff --git a/build.gradle b/build.gradle index 4b0df51..3122dab 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } } 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 // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4f8b8b4..35168c5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ -#Sun Dec 03 16:44:03 CET 2017 +#Wed Jan 09 15:53:32 CET 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip -distributionSha256Sum=5c07b3bac2209fbc98fb1fdf6fd831f72429cdf8c503807404eae03d8c8099e5 +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +distributionSha256Sum=9af7345c199f1731c187c96d3fe3d31f5405192a42046bafa71d846c3d9adacb