Skip to content
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
2 changes: 1 addition & 1 deletion SwitchButton/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.0'
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
}
Expand Down
36 changes: 18 additions & 18 deletions SwitchButton/demo/build.gradle
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 26
buildToolsVersion '26.0.2'
compileSdkVersion 28
buildToolsVersion '28.0.3'

defaultConfig {
applicationId "com.kyleduo.switchbutton.demo"
minSdkVersion 14
targetSdkVersion 26
versionCode Integer.parseInt(VERSION_CODE)
versionName VERSION_NAME
}
buildTypes {
release {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
defaultConfig {
applicationId "com.kyleduo.switchbutton.demo"
minSdkVersion 14
targetSdkVersion 28
versionCode Integer.parseInt(VERSION_CODE)
versionName VERSION_NAME
}
buildTypes {
release {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:26.1.0'
implementation 'com.android.support:recyclerview-v7:26.1.0'
implementation project(':library')
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha01'
implementation project(':library')
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.kyleduo.switchbutton.demo;

import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.kyleduo.switchbutton.demo;

import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import android.widget.CompoundButton;

import com.kyleduo.switchbutton.SwitchButton;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import android.graphics.RectF;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.TextUtils;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import android.animation.Animator;
import android.animation.ObjectAnimator;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import android.view.View;
import android.widget.Button;
import android.widget.CompoundButton;
Expand Down
4 changes: 2 additions & 2 deletions SwitchButton/demo/src/main/res/layout/activity_recycler.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.RecyclerView android:id="@+id/recycler_view"
<androidx.recyclerview.widget.RecyclerView android:id="@+id/recycler_view"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

</android.support.v7.widget.RecyclerView>
</androidx.recyclerview.widget.RecyclerView>
4 changes: 3 additions & 1 deletion SwitchButton/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,6 @@ GROUP=com.kyleduo.switchbutton
DESC=A switch widget, clean and easy to use.
DEVELOPER_ID=kyleduo
DEVELOPER_NAME=kyleduo
DEVELOPER_EMAIL=kyleduo@gmail.com
DEVELOPER_EMAIL=kyleduo@gmail.com
android.useAndroidX=true
android.enableJetifier=true
2 changes: 1 addition & 1 deletion SwitchButton/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-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
40 changes: 20 additions & 20 deletions SwitchButton/library/build.gradle
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 23
buildToolsVersion '26.0.2'
resourcePrefix "ksw"
compileSdkVersion 28
buildToolsVersion '28.0.3'
resourcePrefix "ksw"

defaultConfig {
minSdkVersion 11
targetSdkVersion 23
versionCode Integer.parseInt(VERSION_CODE)
versionName VERSION_NAME
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
defaultConfig {
minSdkVersion 14
targetSdkVersion 28
versionCode Integer.parseInt(VERSION_CODE)
versionName VERSION_NAME
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
//noinspection GradleDependency
implementation 'com.android.support:appcompat-v7:23.1.0'
implementation fileTree(dir: 'libs', include: ['*.jar'])
//noinspection GradleDependency
implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
}

ext {
POM_ARTIFACT_ID = 'library'
POM_NAME = 'SwitchButton'
POM_PACKAGING = 'aar'
POM_ARTIFACT_ID = 'library'
POM_NAME = 'SwitchButton'
POM_PACKAGING = 'aar'
}

apply from: rootProject.file('gradle/gradle-bintray-upload.gradle')
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import android.graphics.drawable.StateListDrawable;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.v4.content.ContextCompat;
import androidx.core.content.ContextCompat;
import android.text.Layout;
import android.text.StaticLayout;
import android.text.TextPaint;
Expand Down