From 0599e9525b3dd20da1340cfbce1fe01747750d9b Mon Sep 17 00:00:00 2001 From: a Date: Thu, 30 Aug 2018 21:44:22 +1200 Subject: [PATCH] upgrade to AndroidX and API v28 --- androidtoggleswitch-sample/build.gradle | 14 +++++++------- androidtoggleswitch/build.gradle | 14 +++++++------- .../widgets/BaseToggleSwitch.kt | 6 +++--- .../widgets/ToggleSwitchButton.kt | 2 +- build.gradle | 6 ++++-- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 6 files changed, 24 insertions(+), 22 deletions(-) diff --git a/androidtoggleswitch-sample/build.gradle b/androidtoggleswitch-sample/build.gradle index 9f5fcaf..3d4430d 100644 --- a/androidtoggleswitch-sample/build.gradle +++ b/androidtoggleswitch-sample/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion '25.0.3' + compileSdkVersion 28 + buildToolsVersion '28.0.2' dataBinding { enabled = true @@ -11,7 +11,7 @@ android { defaultConfig { applicationId "com.llollox.androidtoggleswitch_sample" minSdkVersion 16 - targetSdkVersion 25 + targetSdkVersion 28 versionCode 1 versionName "1.0" @@ -27,10 +27,10 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:25.3.1' - testCompile 'junit:junit:4.12' - compile project(':androidtoggleswitch') + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.appcompat:appcompat:1.0.0-alpha1' + testImplementation 'junit:junit:4.12' + implementation project(':androidtoggleswitch') // compile 'com.llollox:androidtoggleswitch:2.0.1' diff --git a/androidtoggleswitch/build.gradle b/androidtoggleswitch/build.gradle index ec81fec..4f24c2a 100644 --- a/androidtoggleswitch/build.gradle +++ b/androidtoggleswitch/build.gradle @@ -4,16 +4,16 @@ apply plugin: 'kotlin-android' ext { PUBLISH_GROUP_ID = 'com.llollox' PUBLISH_ARTIFACT_ID = 'androidtoggleswitch' - PUBLISH_VERSION = '2.0.1' + PUBLISH_VERSION = '2.0.2' } android { - compileSdkVersion 25 - buildToolsVersion "25.0.3" + compileSdkVersion 28 + buildToolsVersion "28.0.2" defaultConfig { minSdkVersion 16 - targetSdkVersion 25 + targetSdkVersion 28 versionCode 1 versionName "1.0" } @@ -26,9 +26,9 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:25.3.1' - compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.appcompat:appcompat:1.0.0-alpha1' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } apply from: 'https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle' diff --git a/androidtoggleswitch/src/main/java/com/llollox/androidtoggleswitch/widgets/BaseToggleSwitch.kt b/androidtoggleswitch/src/main/java/com/llollox/androidtoggleswitch/widgets/BaseToggleSwitch.kt index 76a9b61..0e440cd 100644 --- a/androidtoggleswitch/src/main/java/com/llollox/androidtoggleswitch/widgets/BaseToggleSwitch.kt +++ b/androidtoggleswitch/src/main/java/com/llollox/androidtoggleswitch/widgets/BaseToggleSwitch.kt @@ -2,15 +2,15 @@ package com.llollox.androidtoggleswitch.widgets import android.content.Context import android.os.Build -import android.support.annotation.RequiresApi -import android.support.v4.content.ContextCompat -import android.support.v4.view.ViewCompat import android.text.TextUtils import android.util.AttributeSet import android.util.TypedValue import android.view.View import android.widget.LinearLayout import android.widget.TextView +import androidx.annotation.RequiresApi +import androidx.core.content.ContextCompat +import androidx.core.view.ViewCompat import com.llollox.androidtoggleswitch.R import java.util.* diff --git a/androidtoggleswitch/src/main/java/com/llollox/androidtoggleswitch/widgets/ToggleSwitchButton.kt b/androidtoggleswitch/src/main/java/com/llollox/androidtoggleswitch/widgets/ToggleSwitchButton.kt index 1fe7147..a592db7 100644 --- a/androidtoggleswitch/src/main/java/com/llollox/androidtoggleswitch/widgets/ToggleSwitchButton.kt +++ b/androidtoggleswitch/src/main/java/com/llollox/androidtoggleswitch/widgets/ToggleSwitchButton.kt @@ -61,7 +61,7 @@ class ToggleSwitchButton (context: Context, var position: Int, var positionType: // Bind Views separator = layoutView.findViewById(R.id.separator) - val clickableWrapper = findViewById(R.id.clickable_wrapper) + val clickableWrapper: LinearLayout = findViewById(R.id.clickable_wrapper) // Setup View val layoutParams = LinearLayout.LayoutParams(toggleWidth, toggleHeight, 1.0f) diff --git a/build.gradle b/build.gradle index a267621..206d244 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.1.3-2' + ext.kotlin_version = '1.2.61' ext.android_plugin_version = '2.3.2' repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.3.0-alpha07' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong @@ -17,6 +18,7 @@ buildscript { allprojects { repositories { + google() jcenter() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b5274ee..25335dc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jun 01 22:33:32 CEST 2017 +#Thu Aug 30 20:53:56 NZST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip