Skip to content

Commit

Permalink
Update dependencies and constants
Browse files Browse the repository at this point in the history
  • Loading branch information
turing-tech committed May 3, 2020
1 parent 4bc3265 commit 73ff64d
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 18 deletions.
16 changes: 8 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 28
buildToolsVersion '28.0.3'
compileSdkVersion 29
buildToolsVersion '29.0.3'

defaultConfig {
applicationId "com.turingtechnologies.materialscrollbardemo"
minSdkVersion 14
targetSdkVersion 28
versionCode 6
versionName "6.0"
targetSdkVersion 29
versionCode 7
versionName "7.0"
}
buildTypes {
release {
Expand All @@ -25,8 +25,8 @@ android {

dependencies {
implementation project(':lib')
implementation "androidx.recyclerview:recyclerview:1.0.0"
implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'com.pnikosis:materialish-progress:1.7'
implementation "com.google.android.material:material:1.0.0"
implementation "androidx.appcompat:appcompat:1.0.2"
implementation 'com.google.android.material:material:1.1.0'
implementation 'androidx.appcompat:appcompat:1.1.0'
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public static void processApps(final AppCompatActivity activity) {
return;
}
//noinspection WrongConstant
pkgAppsList = activity.getPackageManager().getInstalledApplications(PackageManager.GET_ACTIVITIES);
pkgAppsList = activity.getPackageManager().getInstalledApplications(PackageManager.GET_META_DATA);
for(int i = 0; i < pkgAppsList.size(); i++) {
if(activity.getPackageManager().getLaunchIntentForPackage(pkgAppsList.get(i).packageName) == null || (!BuildConfig.DEBUG && pkgAppsList.get(i).packageName.contains(AppData.class.getPackage().getName()))) {
pkgAppsList.remove(i);
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
}
dependencies {
classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0'
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.android.tools.build:gradle:4.0.0-beta05'
// classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
13 changes: 7 additions & 6 deletions lib/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
apply plugin: 'com.android.library'
//apply plugin: 'kotlin-android'

def libVersion = '13.3.2'
def libVersion = '13.3.3'

android {
compileSdkVersion 28
buildToolsVersion '28.0.3'
compileSdkVersion 29
buildToolsVersion '29.0.3'

defaultConfig {
minSdkVersion 14
targetSdkVersion 28
targetSdkVersion 29
versionName libVersion
}
compileOptions {
Expand Down Expand Up @@ -43,8 +43,9 @@ artifacts {
}

dependencies {
implementation "androidx.recyclerview:recyclerview:1.0.0"
implementation "com.google.android.material:material:1.0.0"
implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'com.google.android.material:material:1.1.0'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
// compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
}
repositories {
Expand Down
3 changes: 2 additions & 1 deletion lib/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
POM_NAME=Material Scroll Bar
POM_ARTIFACT_ID=materialScrollBar
POM_PACKAGING=aar
POM_PACKAGING=aar
android.useAndroidX=true

0 comments on commit 73ff64d

Please sign in to comment.