Skip to content

Commit e1701f6

Browse files
DrjackyDrjacky
committed
Make project buildable after 5 years
1 parent 350e16b commit e1701f6

25 files changed

+149
-144
lines changed

‎.idea/compiler.xml

+1-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/encodings.xml

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/gradle.xml

+4-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/inspectionProfiles/Project_Default.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml

+18-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/modules.xml

+4-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/runConfigurations.xml

-12
This file was deleted.

‎app/build.gradle

+47-47
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
22
apply plugin: 'org.greenrobot.greendao'
33

44
android {
5-
compileSdkVersion 25
6-
buildToolsVersion "25.0.3"
5+
compileSdkVersion 33
6+
buildToolsVersion "33.0.0"
77
defaultConfig {
88
applicationId "ir.hosseinabbasi.holidaypirates"
9-
minSdkVersion 15
10-
targetSdkVersion 25
9+
minSdkVersion 21
10+
targetSdkVersion 33
1111
versionCode 1
1212
versionName "1.0"
1313
//testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -40,63 +40,63 @@ greendao {
4040
}
4141

4242
dependencies {
43-
compile fileTree(include: ['*.jar'], dir: 'libs')
43+
implementation fileTree(include: ['*.jar'], dir: 'libs')
4444
/*androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
4545
exclude group: 'com.android.support', module: 'support-annotations'
4646
})
47-
testCompile 'junit:junit:4.12'*/
47+
testImplementation 'junit:junit:4.12'*/
4848
// database
49-
compile 'org.greenrobot:greendao:3.2.2'
49+
implementation 'org.greenrobot:greendao:3.3.0'
5050
// ui
5151
////To Support platform < 21
52-
/*compile 'com.android.support:appcompat-v7:25.4.0'
53-
compile 'com.android.support:recyclerview-v7:25.4.0'
54-
compile 'com.android.support:cardview-v7:25.4.0'
55-
compile 'com.android.support:design:25.4.0'
56-
compile 'com.android.support:support-vector-drawable:25.4.0'
57-
compile 'com.android.support:animated-vector-drawable:25.4.0'*/
58-
compile 'com.android.support:appcompat-v7:25.3.1'
59-
compile 'com.android.support:recyclerview-v7:25.3.1'
60-
compile 'com.android.support:cardview-v7:25.3.1'
61-
compile 'com.android.support:design:25.3.1'
62-
compile 'com.android.support:support-vector-drawable:25.3.1'
63-
compile 'com.android.support:animated-vector-drawable:25.3.1'
64-
/*compile 'com.android.support:appcompat-v7:26.0.0-alpha1'
65-
compile 'com.android.support:recyclerview-v7:26.0.0-alpha1'
66-
compile 'com.android.support:cardview-v7:26.0.0-alpha1'
67-
compile 'com.android.support:design:26.0.0-alpha1'
68-
compile 'com.android.support:support-vector-drawable:26.0.0-alpha1'
69-
compile 'com.android.support:animated-vector-drawable:26.0.0-alpha1'*/
52+
/*implementation 'com.android.support:appcompat-v7:25.4.0'
53+
implementation 'com.android.support:recyclerview-v7:25.4.0'
54+
implementation 'com.android.support:cardview-v7:25.4.0'
55+
implementation 'com.android.support:design:25.4.0'
56+
implementation 'com.android.support:support-vector-drawable:25.4.0'
57+
implementation 'com.android.support:animated-vector-drawable:25.4.0'*/
58+
implementation 'com.android.support:appcompat-v7:28.0.0'
59+
implementation 'com.android.support:recyclerview-v7:28.0.0'
60+
implementation 'com.android.support:cardview-v7:28.0.0'
61+
implementation 'com.android.support:design:28.0.0'
62+
implementation 'com.android.support:support-vector-drawable:28.0.0'
63+
implementation 'com.android.support:animated-vector-drawable:28.0.0'
64+
/*implementation 'com.android.support:appcompat-v7:26.0.0-alpha1'
65+
implementation 'com.android.support:recyclerview-v7:26.0.0-alpha1'
66+
implementation 'com.android.support:cardview-v7:26.0.0-alpha1'
67+
implementation 'com.android.support:design:26.0.0-alpha1'
68+
implementation 'com.android.support:support-vector-drawable:26.0.0-alpha1'
69+
implementation 'com.android.support:animated-vector-drawable:26.0.0-alpha1'*/
7070
////
7171
// font
72-
compile 'uk.co.chrisjenx:calligraphy:2.2.0'
72+
implementation 'uk.co.chrisjenx:calligraphy:2.3.0'
7373
// network
74-
compile 'com.amitshekhar.android:rx2-android-networking:1.0.0'
75-
compile 'com.squareup.retrofit2:retrofit:2.3.0'
76-
compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
77-
compile 'com.squareup.retrofit2:converter-gson:2.3.0'
78-
compile 'com.squareup.retrofit2:converter-scalars:2.3.0'
74+
implementation 'com.amitshekhar.android:rx2-android-networking:1.0.0'
75+
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
76+
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.9.0'
77+
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
78+
implementation 'com.squareup.retrofit2:converter-scalars:2.9.0'
7979
// parser
80-
compile 'com.google.code.gson:gson:2.8.0'
80+
implementation 'com.google.code.gson:gson:2.9.1'
8181
// debug database
82-
debugCompile 'com.amitshekhar.android:debug-db:1.0.0'
82+
debugImplementation 'com.amitshekhar.android:debug-db:1.0.6'
8383
// dependency injection
84-
compile 'com.google.dagger:dagger:2.8'
85-
annotationProcessor 'com.google.dagger:dagger-compiler:2.8'
86-
provided 'javax.annotation:jsr250-api:1.0'
87-
compile 'javax.inject:javax.inject:1'
88-
provided 'com.google.dagger:dagger-compiler:2.8'
89-
provided 'org.glassfish:javax.annotation:10.0-b28'
84+
implementation 'com.google.dagger:dagger:2.44'
85+
annotationProcessor 'com.google.dagger:dagger-compiler:2.44'
86+
compileOnly'javax.annotation:jsr250-api:1.0'
87+
implementation 'javax.inject:javax.inject:1'
88+
compileOnly'com.google.dagger:dagger-compiler:2.44'
89+
compileOnly'org.glassfish:javax.annotation:10.0-b28'
9090
// reactive
91-
compile 'io.reactivex.rxjava2:rxjava:2.0.6'
92-
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
91+
implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
92+
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
9393
// code generator for view
94-
compile 'com.jakewharton:butterknife:8.5.1'
95-
annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
94+
implementation 'com.jakewharton:butterknife:10.2.3'
95+
annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.3'
9696
// logger
97-
compile 'com.jakewharton.timber:timber:4.5.1'
97+
implementation 'com.jakewharton.timber:timber:5.0.1'
9898
// swipe view
99-
compile 'com.mindorks:placeholderview:0.6.1'
100-
compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
101-
compile 'com.squareup.picasso:picasso:2.5.2'
99+
implementation 'com.mindorks:placeholderview:0.6.1'
100+
implementation 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
101+
implementation 'com.squareup.picasso:picasso:2.71828'
102102
}

‎app/src/main/AndroidManifest.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<uses-permission android:name="android.permission.INTERNET" />
66
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
77

8-
<uses-sdk tools:overrideLibrary="com.mindorks.placeholderview"/>
8+
<uses-sdk tools:overrideLibrary="com.mindorks.placeholderview" />
99

1010
<application
1111
android:name="ir.hosseinabbasi.holidaypirates.MvpApp"
@@ -18,6 +18,7 @@
1818

1919
<activity
2020
android:name="ir.hosseinabbasi.holidaypirates.ui.splash.SplashActivity"
21+
android:exported="true"
2122
android:launchMode="singleTop"
2223
android:screenOrientation="portrait"
2324
android:theme="@style/AppThemeFullScreen">

‎app/src/main/java/ir/hosseinabbasi/holidaypirates/data/AppDataManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*/
2626

2727
@Singleton
28-
public class AppDataManager implements DataManager, ApiHelper {
28+
public class AppDataManager implements DataManager/*, ApiHelper*/ {
2929

3030
private static final String TAG = "AppDataManager";
3131

‎app/src/main/java/ir/hosseinabbasi/holidaypirates/ui/base/BaseActivity.java

+8-6
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,17 @@
66
import android.content.pm.PackageManager;
77
import android.os.Build;
88
import android.os.Bundle;
9-
import android.support.annotation.Nullable;
10-
import android.support.annotation.StringRes;
11-
import android.support.design.widget.Snackbar;
12-
import android.support.v4.content.ContextCompat;
13-
import android.support.v7.app.AppCompatActivity;
149
import android.view.View;
1510
import android.view.inputmethod.InputMethodManager;
1611
import android.widget.TextView;
1712

13+
import androidx.annotation.Nullable;
14+
import androidx.annotation.StringRes;
15+
import androidx.appcompat.app.AppCompatActivity;
16+
import androidx.core.content.ContextCompat;
17+
18+
import com.google.android.material.snackbar.Snackbar;
19+
1820
import butterknife.Unbinder;
1921
import ir.hosseinabbasi.holidaypirates.MvpApp;
2022
import ir.hosseinabbasi.holidaypirates.R;
@@ -95,7 +97,7 @@ private void showSnackBar(String message) {
9597
message, Snackbar.LENGTH_SHORT);
9698
View sbView = snackbar.getView();
9799
TextView textView = (TextView) sbView
98-
.findViewById(android.support.design.R.id.snackbar_text);
100+
.findViewById(R.id.snackbar_text);
99101
textView.setTextColor(ContextCompat.getColor(this, R.color.white));
100102
snackbar.show();
101103
}

‎app/src/main/java/ir/hosseinabbasi/holidaypirates/ui/base/BaseFragment.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
import android.content.Context;
44
import android.os.Bundle;
5-
import android.support.annotation.Nullable;
6-
import android.support.annotation.StringRes;
7-
import android.support.v4.app.Fragment;
85
import android.view.View;
96

7+
import androidx.annotation.Nullable;
8+
import androidx.annotation.StringRes;
9+
import androidx.fragment.app.Fragment;
10+
1011
import butterknife.Unbinder;
1112
import ir.hosseinabbasi.holidaypirates.di.component.ActivityComponent;
1213

‎app/src/main/java/ir/hosseinabbasi/holidaypirates/ui/base/MvpView.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package ir.hosseinabbasi.holidaypirates.ui.base;
22

3-
import android.support.annotation.StringRes;
3+
import androidx.annotation.StringRes;
44

55
/**
66
* Created by Dr.jacky on 2017/07/13.

‎app/src/main/java/ir/hosseinabbasi/holidaypirates/ui/detail/CommentsAdapter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
*/
66

77
import android.content.Context;
8-
import android.support.v7.widget.CardView;
9-
import android.support.v7.widget.RecyclerView;
108
import android.view.LayoutInflater;
119
import android.view.View;
1210
import android.view.ViewGroup;
@@ -15,6 +13,8 @@
1513
import android.widget.RelativeLayout;
1614
import android.widget.TextView;
1715

16+
import androidx.recyclerview.widget.RecyclerView;
17+
1818
import java.util.List;
1919

2020
import io.reactivex.Observable;

0 commit comments

Comments
 (0)