diff --git a/README.md b/README.md index 778aa88..9530dd7 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,16 @@ +2026 Revival / AndroidX Migration +Maintained by Skyraidr + +This is a modernized fork of the original mCalendarView. + +Migrated: Updated all Support Library dependencies to AndroidX. + +Fixed: Removed deprecated JCenter/Bintray upload scripts. + +Compatible: Verified working on Android Studio Ladybug/Meerkat (API 34+). + +Use this fork if you need this library in a modern Android project. + # mCalendarView [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-mCalendarView-brightgreen.svg?style=flat)](http://android-arsenal.com/details/1/2420) diff --git a/mcalendarview/build.gradle b/mcalendarview/build.gradle index 1c32490..575bbff 100644 --- a/mcalendarview/build.gradle +++ b/mcalendarview/build.gradle @@ -1,6 +1,5 @@ apply plugin: 'com.android.library' -apply plugin: 'com.github.dcendents.android-maven' -apply plugin: 'com.jfrog.bintray' + version = "1.0.0" @@ -9,12 +8,12 @@ def gitUrl = "https://github.com/SpongeBobSun/mCalendarView.git" group = "sun.bob" android { - compileSdkVersion 24 - buildToolsVersion "24.0.0" + compileSdkVersion 33 + defaultConfig { minSdkVersion 16 - targetSdkVersion 24 + targetSdkVersion 33 resourcePrefix "23" versionCode 1 versionName "1.0" @@ -28,43 +27,10 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:24.0.0' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.appcompat:appcompat:1.6.1' } - -install { - repositories.mavenInstaller { - // This generates POM.xml with proper parameters - pom { - project { - packaging 'aar' - // Add your description here - name 'Customizable & Shrinkable Calendar Widget for Android' - url siteUrl - // Set your license - licenses { - license { - name 'The Apache Software License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - } - } - developers { - developer { - id 'SpongeBobSun' - name 'Bob Sun' - email 'bobsun@outlook.com' - } - } - scm { - connection gitUrl - developerConnection gitUrl - url siteUrl - } - } - } - } -} task sourcesJar(type: Jar) { from android.sourceSets.main.java.srcDirs classifier = 'sources' @@ -77,25 +43,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) { classifier = 'javadoc' from javadoc.destinationDir } -artifacts { - archives javadocJar - archives sourcesJar -} -Properties properties = new Properties() -properties.load(project.rootProject.file('local.properties').newDataInputStream()) -bintray { - user = properties.getProperty("bintray.user") - key = properties.getProperty("bintray.apikey") - configurations = ['archives'] - pkg { - repo = "maven" - name = "mCalendarView" - websiteUrl = siteUrl - vcsUrl = gitUrl - licenses = ["Apache-2.0"] - publish = true - } -} + javadoc { options{ encoding "UTF-8" diff --git a/mcalendarview/src/main/java/sun/bob/mcalendarview/MCalendarView.java b/mcalendarview/src/main/java/sun/bob/mcalendarview/MCalendarView.java index 0c2d321..e3b1ab9 100644 --- a/mcalendarview/src/main/java/sun/bob/mcalendarview/MCalendarView.java +++ b/mcalendarview/src/main/java/sun/bob/mcalendarview/MCalendarView.java @@ -5,8 +5,8 @@ import android.graphics.Paint; import android.graphics.drawable.ShapeDrawable; import android.graphics.drawable.shapes.RectShape; -import android.support.v4.app.FragmentActivity; -import android.support.v4.view.ViewPager; +import androidx.fragment.app.FragmentActivity; +import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import android.view.View; diff --git a/mcalendarview/src/main/java/sun/bob/mcalendarview/adapters/CalendarViewAdapter.java b/mcalendarview/src/main/java/sun/bob/mcalendarview/adapters/CalendarViewAdapter.java index 7d5092f..16403f7 100644 --- a/mcalendarview/src/main/java/sun/bob/mcalendarview/adapters/CalendarViewAdapter.java +++ b/mcalendarview/src/main/java/sun/bob/mcalendarview/adapters/CalendarViewAdapter.java @@ -1,9 +1,9 @@ package sun.bob.mcalendarview.adapters; import android.content.Context; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; import android.view.ViewGroup; import sun.bob.mcalendarview.fragments.MonthFragment; diff --git a/mcalendarview/src/main/java/sun/bob/mcalendarview/adapters/CalendarViewExpAdapter.java b/mcalendarview/src/main/java/sun/bob/mcalendarview/adapters/CalendarViewExpAdapter.java index c981f74..7ef1f6c 100644 --- a/mcalendarview/src/main/java/sun/bob/mcalendarview/adapters/CalendarViewExpAdapter.java +++ b/mcalendarview/src/main/java/sun/bob/mcalendarview/adapters/CalendarViewExpAdapter.java @@ -1,9 +1,9 @@ package sun.bob.mcalendarview.adapters; import android.content.Context; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; import android.view.ViewGroup; import sun.bob.mcalendarview.views.ExpCalendarView; import sun.bob.mcalendarview.views.MonthExpFragment; diff --git a/mcalendarview/src/main/java/sun/bob/mcalendarview/fragments/MonthFragment.java b/mcalendarview/src/main/java/sun/bob/mcalendarview/fragments/MonthFragment.java index 848d5ce..aed2ee0 100644 --- a/mcalendarview/src/main/java/sun/bob/mcalendarview/fragments/MonthFragment.java +++ b/mcalendarview/src/main/java/sun/bob/mcalendarview/fragments/MonthFragment.java @@ -1,7 +1,7 @@ package sun.bob.mcalendarview.fragments; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; diff --git a/mcalendarview/src/main/java/sun/bob/mcalendarview/listeners/OnMonthChangeListener.java b/mcalendarview/src/main/java/sun/bob/mcalendarview/listeners/OnMonthChangeListener.java index bd751e0..960b8ab 100644 --- a/mcalendarview/src/main/java/sun/bob/mcalendarview/listeners/OnMonthChangeListener.java +++ b/mcalendarview/src/main/java/sun/bob/mcalendarview/listeners/OnMonthChangeListener.java @@ -1,8 +1,6 @@ package sun.bob.mcalendarview.listeners; -import android.support.v4.view.ViewPager; -import android.util.Log; -import android.view.View; +import androidx.viewpager.widget.ViewPager; import sun.bob.mcalendarview.utils.CalendarUtil; diff --git a/mcalendarview/src/main/java/sun/bob/mcalendarview/listeners/OnMonthScrollListener.java b/mcalendarview/src/main/java/sun/bob/mcalendarview/listeners/OnMonthScrollListener.java index c6f004b..6fcc961 100644 --- a/mcalendarview/src/main/java/sun/bob/mcalendarview/listeners/OnMonthScrollListener.java +++ b/mcalendarview/src/main/java/sun/bob/mcalendarview/listeners/OnMonthScrollListener.java @@ -1,6 +1,6 @@ package sun.bob.mcalendarview.listeners; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.ViewPager; import sun.bob.mcalendarview.CellConfig; import sun.bob.mcalendarview.utils.ExpCalendarUtil; diff --git a/mcalendarview/src/main/java/sun/bob/mcalendarview/views/ExpCalendarView.java b/mcalendarview/src/main/java/sun/bob/mcalendarview/views/ExpCalendarView.java index 0ddf74e..90e4854 100644 --- a/mcalendarview/src/main/java/sun/bob/mcalendarview/views/ExpCalendarView.java +++ b/mcalendarview/src/main/java/sun/bob/mcalendarview/views/ExpCalendarView.java @@ -1,8 +1,8 @@ package sun.bob.mcalendarview.views; import android.content.Context; -import android.support.v4.app.FragmentActivity; -import android.support.v4.view.ViewPager; +import androidx.fragment.app.FragmentActivity; +import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import android.view.View; @@ -15,7 +15,6 @@ import sun.bob.mcalendarview.listeners.OnDateClickListener; import sun.bob.mcalendarview.listeners.OnMonthChangeListener; import sun.bob.mcalendarview.listeners.OnMonthScrollListener; -import sun.bob.mcalendarview.utils.CalendarUtil; import sun.bob.mcalendarview.utils.CurrentCalendar; import sun.bob.mcalendarview.vo.DateData; import sun.bob.mcalendarview.vo.MarkedDates; diff --git a/mcalendarview/src/main/java/sun/bob/mcalendarview/views/MonthExpFragment.java b/mcalendarview/src/main/java/sun/bob/mcalendarview/views/MonthExpFragment.java index bd2277c..04ca499 100644 --- a/mcalendarview/src/main/java/sun/bob/mcalendarview/views/MonthExpFragment.java +++ b/mcalendarview/src/main/java/sun/bob/mcalendarview/views/MonthExpFragment.java @@ -2,7 +2,7 @@ import android.graphics.Color; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/mcalendarview/src/main/java/sun/bob/mcalendarview/vo/MonthWeekData.java b/mcalendarview/src/main/java/sun/bob/mcalendarview/vo/MonthWeekData.java index 001b94b..fe4efd0 100644 --- a/mcalendarview/src/main/java/sun/bob/mcalendarview/vo/MonthWeekData.java +++ b/mcalendarview/src/main/java/sun/bob/mcalendarview/vo/MonthWeekData.java @@ -1,7 +1,7 @@ package sun.bob.mcalendarview.vo; import android.graphics.Color; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import java.util.ArrayList;