Skip to content
This repository was archived by the owner on Oct 2, 2023. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.0'
classpath 'com.android.tools.build:gradle:7.1.1'
}
}

Expand All @@ -23,18 +23,17 @@ ext {
libraryVersion = VERSION_NAME

//Support and Build tools version
compileSdk = 28
targetSdk = 28
minSdk = 19
ftKit = '0.6.0'
appCompileSdk = 31
appTargetSdk = 28
appMinSdk = 21
ftKit = '0.6.2'

//Support Libraries dependencies
supportDependencies = [
support : 'androidx.legacy:legacy-support-v4:1.0.0',
appCompat : 'androidx.appcompat:appcompat:1.0.0',
recycler : 'androidx.recyclerview:recyclerview:1.0.0',
cardView : 'androidx.cardview:cardview:1.0.0',
kitCore : "com.52inc:52Kit-core:${ftKit}"
kitCore : "com.52inc:52Kit-core:${ftKit}"/*https://mvnrepository.com/artifact/com.52inc/52Kit-core/*/
]

}
20 changes: 10 additions & 10 deletions example/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion targetSdk
compileSdkVersion appCompileSdk

defaultConfig {
applicationId "com.r0adkll.slidr.example"
minSdkVersion minSdk
targetSdkVersion targetSdk
minSdkVersion appMinSdk
targetSdkVersion appTargetSdk
versionCode 1
versionName VERSION_NAME
}
Expand All @@ -18,14 +18,14 @@ android {
}
}

lintOptions {
abortOnError false
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
lint {
abortOnError false
}
}

dependencies {
Expand All @@ -37,8 +37,8 @@ dependencies {
implementation supportDependencies.cardView
implementation supportDependencies.kitCore

implementation 'com.jakewharton:butterknife:10.1.0'
annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
implementation 'com.github.bumptech.glide:glide:3.8.0'
implementation 'com.google.code.gson:gson:2.8.5'
implementation 'com.jakewharton:butterknife:10.2.3'
annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.3'
implementation 'com.github.bumptech.glide:glide:4.8.0'
implementation 'com.google.code.gson:gson:2.8.9'
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import android.view.MenuItem;
import android.view.View;
import android.widget.TextView;
Expand All @@ -17,8 +15,11 @@
import com.r0adkll.slidr.model.SlidrConfig;
import com.r0adkll.slidr.model.SlidrPosition;

import butterknife.ButterKnife;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;


Expand Down Expand Up @@ -82,7 +83,6 @@ protected void onCreate(Bundle savedInstanceState) {
// Load header image
Glide.with(this)
.load(mOS.image_url)
.crossFade()
.into(mCover);
}

Expand All @@ -103,7 +103,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
}

@Override
protected void onSaveInstanceState(Bundle outState) {
protected void onSaveInstanceState(@NonNull Bundle outState) {
super.onSaveInstanceState(outState);
outState.putParcelable(EXTRA_OS, mOS);
}
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-5.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
13 changes: 7 additions & 6 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ apply plugin: 'com.android.library'
apply plugin: 'maven'

android {
compileSdkVersion compileSdk
compileSdkVersion appCompileSdk

defaultConfig {
minSdkVersion minSdk
targetSdkVersion targetSdk
minSdkVersion appMinSdk
targetSdkVersion appTargetSdk
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

Expand All @@ -21,9 +21,10 @@ android {
}

dependencies {
implementation supportDependencies.support
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:3.0.0'
implementation 'androidx.annotation:annotation:1.3.0'
implementation 'androidx.fragment:fragment:1.4.1'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-core:4.3.1'
testImplementation 'org.hamcrest:hamcrest-library:1.3'
testImplementation 'org.powermock:powermock-api-mockito:1.6.2'
testImplementation 'org.powermock:powermock-module-junit4:1.6.2'
Expand Down