Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate to androidX #2594

Merged
merged 5 commits into from
Mar 16, 2019
Merged

Migrate to androidX #2594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7305b7b
Update dependencies and migrate to androidX
maskaravivek Mar 14, 2019
b4c4898
Merge branch 'master' into androidXMigration
domdomegg Mar 15, 2019
cbd344d
Fix bad merge
domdomegg Mar 15, 2019
f3d7d70
Make gradle properties tidy
maskaravivek Mar 16, 2019
6467db5
Merge branch 'androidXMigration' of https://github.com/maskaravivek/a…
maskaravivek Mar 16, 2019
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
36 changes: 23 additions & 13 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ dependencies {
implementation 'com.karumi:dexter:5.0.0'
implementation "com.jakewharton:butterknife:$BUTTERKNIFE_VERSION"
kapt "com.jakewharton:butterknife-compiler:$BUTTERKNIFE_VERSION"

// Logging
implementation 'ch.acra:acra:4.9.2'
implementation 'com.jakewharton.timber:timber:4.7.1'
Expand All @@ -65,10 +66,10 @@ dependencies {
// Android testing
androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$KOTLIN_VERSION"
androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.10.0'
androidTestImplementation 'com.android.support.test:rules:1.0.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation "com.android.support:support-annotations:$SUPPORT_LIB_VERSION"
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'androidx.test:rules:1.1.2-alpha02'
androidTestImplementation 'androidx.test:runner:1.1.2-alpha02'
androidTestImplementation "androidx.annotation:annotation:1.0.2"
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0-alpha02'
androidTestImplementation 'org.mockito:mockito-core:2.10.0'

// Debugging
Expand All @@ -78,12 +79,12 @@ dependencies {
testImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$LEAK_CANARY_VERSION"

// Support libraries
implementation "com.android.support:support-v4:$SUPPORT_LIB_VERSION"
implementation "com.android.support:appcompat-v7:$SUPPORT_LIB_VERSION"
implementation "com.android.support:design:$SUPPORT_LIB_VERSION"
implementation "com.android.support:customtabs:$SUPPORT_LIB_VERSION"
implementation "com.android.support:cardview-v7:$SUPPORT_LIB_VERSION"
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation "androidx.legacy:legacy-support-v4:1.0.0"
implementation "androidx.appcompat:appcompat:1.0.2"
implementation "com.google.android.material:material:1.1.0-alpha04"
implementation "androidx.browser:browser:1.0.0"
implementation "androidx.cardview:cardview:1.0.0"
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'

//swipe_layout
implementation 'com.daimajia.swipelayout:library:1.2.0@aar'
Expand All @@ -92,8 +93,8 @@ dependencies {
}

android {
compileSdkVersion project.compileSdkVersion
buildToolsVersion project.buildToolsVersion
compileSdkVersion 28
buildToolsVersion "28.0.3"

defaultConfig {
applicationId 'fr.free.nrw.commons'
Expand All @@ -103,10 +104,15 @@ android {

minSdkVersion 15
targetSdkVersion 28
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
}

packagingOptions {
exclude 'META-INF/androidx.*'
exclude 'META-INF/proguard/androidx-annotations.pro'
}

testOptions {
unitTests.returnDefaultValues = true

Expand Down Expand Up @@ -154,6 +160,10 @@ android {
signingConfigs.release.keyPassword = System.getenv("key_password")
}

configurations.all {
resolutionStrategy.force 'androidx.annotation:annotation:1.0.2'
}

flavorDimensions 'tier'
productFlavors {
prod {
Expand Down
22 changes: 11 additions & 11 deletions app/src/androidTest/java/fr/free/nrw/commons/SettingsActivityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package fr.free.nrw.commons;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.espresso.Espresso;
import android.support.test.espresso.matcher.PreferenceMatchers;
import android.support.test.filters.LargeTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import androidx.test.InstrumentationRegistry;
import androidx.test.espresso.Espresso;
import androidx.test.espresso.matcher.PreferenceMatchers;
import androidx.test.filters.LargeTest;
import androidx.test.rule.ActivityTestRule;
import androidx.test.runner.AndroidJUnit4;

import org.junit.Before;
import org.junit.Rule;
Expand All @@ -17,11 +17,11 @@
import fr.free.nrw.commons.settings.Prefs;
import fr.free.nrw.commons.settings.SettingsActivity;

import static android.support.test.espresso.action.ViewActions.click;
import static android.support.test.espresso.action.ViewActions.replaceText;
import static android.support.test.espresso.assertion.ViewAssertions.matches;
import static android.support.test.espresso.matcher.ViewMatchers.withId;
import static android.support.test.espresso.matcher.ViewMatchers.withText;
import static androidx.test.espresso.action.ViewActions.click;
import static androidx.test.espresso.action.ViewActions.replaceText;
import static androidx.test.espresso.assertion.ViewAssertions.matches;
import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static androidx.test.espresso.matcher.ViewMatchers.withText;
import static org.hamcrest.Matchers.allOf;
import static org.junit.Assert.assertEquals;

Expand Down
6 changes: 5 additions & 1 deletion app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="fr.free.nrw.commons">

<uses-permission android:name="android.permission.INTERNET" />
Expand Down Expand Up @@ -30,7 +31,10 @@
android:theme="@style/LightAppTheme"
android:largeHeap="true"
android:hardwareAccelerated="false"
android:supportsRtl="true" >
android:supportsRtl="true"
tools:replace="android:appComponentFactory"
android:appComponentFactory="commons"
tools:ignore="GoogleAppIndexingWarning">

<activity android:name="org.acra.CrashReportDialog"
android:theme="@android:style/Theme.Dialog"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import android.database.sqlite.SQLiteDatabase;
import android.os.Build;
import android.os.Process;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.util.Log;

import com.facebook.drawee.backends.pipeline.Fresco;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/fr/free/nrw/commons/License.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package fr.free.nrw.commons;

import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

/**
* represents Licence object
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/fr/free/nrw/commons/LicenseList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import android.app.Activity;
import android.content.res.Resources;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/fr/free/nrw/commons/Media.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import android.net.Uri;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import java.util.ArrayList;
import java.util.Date;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package fr.free.nrw.commons;

import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import android.text.TextUtils;

import org.w3c.dom.Document;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/fr/free/nrw/commons/MediaThumbnailFetchTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package fr.free.nrw.commons;

import android.os.AsyncTask;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;

import fr.free.nrw.commons.mwapi.MediaWikiApi;

Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/fr/free/nrw/commons/MediaWikiImageView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package fr.free.nrw.commons;

import android.content.Context;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.graphics.drawable.VectorDrawableCompat;
import android.support.v4.util.LruCache;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
import androidx.collection.LruCache;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.widget.Toast;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/fr/free/nrw/commons/PageTitle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package fr.free.nrw.commons;

import android.net.Uri;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;

public class PageTitle {
private final String namespace;
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/fr/free/nrw/commons/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
import android.content.Intent;
import android.graphics.Bitmap;
import android.net.Uri;
import android.support.annotation.NonNull;
import android.support.customtabs.CustomTabsIntent;
import android.support.v4.content.ContextCompat;
import androidx.annotation.NonNull;
import androidx.browser.customtabs.CustomTabsIntent;
import androidx.core.content.ContextCompat;
import android.view.View;
import android.widget.Toast;

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.view.ViewPager;
import androidx.viewpager.widget.ViewPager;
import android.view.View;

import com.viewpagerindicator.CirclePageIndicator;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/fr/free/nrw/commons/WelcomePagerAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package fr.free.nrw.commons;

import android.net.Uri;
import android.support.annotation.Nullable;
import android.support.v4.view.PagerAdapter;
import androidx.annotation.Nullable;
import androidx.viewpager.widget.PagerAdapter;
import android.text.Html;
import android.view.LayoutInflater;
import android.view.View;
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
import android.support.v4.content.FileProvider;
import android.support.v4.content.res.ResourcesCompat;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.Toolbar;
import androidx.core.content.FileProvider;
import androidx.core.content.res.ResourcesCompat;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.Toolbar;
import android.util.DisplayMetrics;
import android.view.ContextThemeWrapper;
import android.view.LayoutInflater;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/fr/free/nrw/commons/auth/AccountUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import android.accounts.Account;
import android.accounts.AccountManager;
import android.content.Context;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import fr.free.nrw.commons.BuildConfig;
import timber.log.Timber;
Expand Down
16 changes: 8 additions & 8 deletions app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.support.annotation.ColorRes;
import android.support.annotation.NonNull;
import android.support.annotation.StringRes;
import android.support.design.widget.TextInputLayout;
import android.support.v4.app.NavUtils;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatDelegate;
import androidx.annotation.ColorRes;
import androidx.annotation.NonNull;
import androidx.annotation.StringRes;
import com.google.android.material.textfield.TextInputLayout;
import androidx.core.app.NavUtils;
import androidx.core.content.ContextCompat;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatDelegate;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.MenuInflater;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import fr.free.nrw.commons.BuildConfig;

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import android.accounts.AbstractAccountAuthenticator;
import android.content.Intent;
import android.os.IBinder;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;

import fr.free.nrw.commons.di.CommonsDaggerService;

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarkPages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package fr.free.nrw.commons.bookmarks;

import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;

/**
* Data class for handling a bookmark fragment and it title
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarksActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import android.content.Intent;
import android.database.DataSetObserver;
import android.os.Bundle;
import android.support.design.widget.TabLayout;
import android.support.v4.app.FragmentManager;
import android.support.v4.view.ViewPager;
import com.google.android.material.tabs.TabLayout;
import androidx.fragment.app.FragmentManager;
import androidx.viewpager.widget.ViewPager;
import android.view.View;
import android.widget.AdapterView;

Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarksPagerAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package fr.free.nrw.commons.bookmarks;

import android.content.Context;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter;
import android.widget.ListAdapter;

import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsContentProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteQueryBuilder;
import android.net.Uri;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.text.TextUtils;

import javax.inject.Inject;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.os.RemoteException;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;

import java.util.ArrayList;
import java.util.List;
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesContentProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteQueryBuilder;
import android.net.Uri;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.text.TextUtils;

import javax.inject.Inject;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/fr/free/nrw/commons/bookmarks/pictures/BookmarkPicturesDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.os.RemoteException;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;

import java.util.ArrayList;
import java.util.List;
Expand Down
Loading