Skip to content

Migrate to androidx #6

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Migrate to androidx #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a8f9026
Set compile sdk v 28
elagarrigue Oct 16, 2018
9943ed2
Update android tools version
elagarrigue Oct 16, 2018
6c2cc5f
Migrate to androidx
elagarrigue Oct 17, 2018
37ec40a
Migrate to androidx
elagarrigue Oct 18, 2018
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
12 changes: 6 additions & 6 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:3.1.3'
classpath 'com.android.tools.build:gradle:3.2.1'
}
}

apply plugin: 'com.android.library'

android {
compileSdkVersion 27
buildToolsVersion "27.0.3"
compileSdkVersion 28
buildToolsVersion "28.0.3"

defaultConfig {
minSdkVersion 10
targetSdkVersion 27
minSdkVersion 15
targetSdkVersion 28
}

lintOptions { abortOnError false }
Expand All @@ -29,5 +29,5 @@ repositories {
}

dependencies {
implementation "com.android.support:appcompat-v7:27.1.1"
implementation 'androidx.appcompat:appcompat:1.0.0'
}
2 changes: 1 addition & 1 deletion src/main/java/com/skedgo/android/weekpicker/SwipeDisableViewPager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.skedgo.android.weekpicker;

import android.content.Context;
import android.support.v4.view.ViewPager;
import androidx.viewpager.widget.ViewPager;
import android.util.AttributeSet;
import android.view.MotionEvent;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/skedgo/android/weekpicker/WeekFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.skedgo.android.weekpicker;

import android.os.Bundle;
import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;
import android.text.format.DateUtils;
import android.text.format.Time;
import android.util.Log;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/skedgo/android/weekpicker/WeekPickerFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import android.os.Build;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentStatePagerAdapter;
import android.support.v4.view.ViewPager;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentStatePagerAdapter;
import androidx.viewpager.widget.ViewPager;
import android.text.format.Time;
import android.util.Log;
import android.util.SparseArray;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/skedgo/android/weekpicker/WeekView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import android.graphics.Canvas;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.support.annotation.ColorInt;
import android.support.v4.view.ViewCompat;
import androidx.annotation.ColorInt;
import androidx.core.view.ViewCompat;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.widget.LinearLayout;
Expand Down