From 03c79acd56ceb217ee7928c219a8ffba59b1d06a Mon Sep 17 00:00:00 2001 From: vikeshdass Date: Thu, 19 Nov 2020 13:50:15 +0530 Subject: [PATCH 1/6] updated gradle --- .idea/gradle.xml | 11 ++++----- .idea/sonarIssues.xml | 29 ++++++++++++++++++++++++ CursorWheelLayout.iml | 4 ++++ app/app.iml | 7 +++++- app/build.gradle | 25 ++++++++++++-------- build.gradle | 6 +++-- gradle/wrapper/gradle-wrapper.properties | 2 +- library/build.gradle | 24 ++++++++++++++------ library/library.iml | 8 +++++-- 9 files changed, 87 insertions(+), 29 deletions(-) create mode 100644 .idea/sonarIssues.xml diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 6e1114a..7d55b84 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,8 +1,10 @@ + diff --git a/.idea/sonarIssues.xml b/.idea/sonarIssues.xml new file mode 100644 index 0000000..59f6a7f --- /dev/null +++ b/.idea/sonarIssues.xml @@ -0,0 +1,29 @@ + + + + + + \ No newline at end of file diff --git a/CursorWheelLayout.iml b/CursorWheelLayout.iml index c5ca878..ceef0db 100644 --- a/CursorWheelLayout.iml +++ b/CursorWheelLayout.iml @@ -221,4 +221,8 @@ + + \ No newline at end of file diff --git a/app/app.iml b/app/app.iml index fa18371..020e244 100644 --- a/app/app.iml +++ b/app/app.iml @@ -4,12 +4,13 @@ + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 6d015a5..2af8bbc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 30 + buildToolsVersion "30.0.2" defaultConfig { applicationId "github.hellocsl.cursorwheellayout" - minSdkVersion 14 - targetSdkVersion 23 + minSdkVersion 19 + targetSdkVersion 30 versionCode 1 versionName "1.0" } @@ -17,12 +17,19 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:23.2.1' - compile project(':library') - compile 'com.jakewharton:butterknife:7.0.1' + implementation fileTree(include: ['*.jar'], dir: 'libs') + testImplementation 'junit:junit:4.13.1' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation project(':library') + implementation 'com.jakewharton:butterknife:7.0.1' } diff --git a/build.gradle b/build.gradle index 85bf6c6..aecbc4a 100644 --- a/build.gradle +++ b/build.gradle @@ -2,11 +2,12 @@ buildscript { repositories { + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.2' - classpath 'com.novoda:bintray-release:0.3.4' + classpath "com.android.tools.build:gradle:4.1.1" + classpath 'com.novoda:bintray-release:0.9.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,6 +16,7 @@ buildscript { allprojects { repositories { + google() jcenter() } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7882136..bec1862 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip diff --git a/library/build.gradle b/library/build.gradle index 9408267..f0932a4 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' apply plugin: 'com.novoda.bintray-release' android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 30 + buildToolsVersion "30.0.2" defaultConfig { - minSdkVersion 14 - targetSdkVersion 23 + minSdkVersion 19 + targetSdkVersion 30 versionCode 1 versionName "1.0" } @@ -16,12 +16,22 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + buildFeatures { + dataBinding true + } } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile 'junit:junit:4.12' - compile 'com.android.support:support-annotations:23.2.1' + implementation fileTree(dir: 'libs', include: ['*.jar']) + testImplementation 'junit:junit:4.13.1' + implementation 'com.android.support:support-annotations:28.0.0' } diff --git a/library/library.iml b/library/library.iml index 07f3e6c..f4e05ee 100644 --- a/library/library.iml +++ b/library/library.iml @@ -4,12 +4,13 @@ @@ -325,4 +325,8 @@ + + \ No newline at end of file From a03607a8f337b02586bf7c376f85a1c4051ca038 Mon Sep 17 00:00:00 2001 From: vikeshdass Date: Thu, 19 Nov 2020 14:13:20 +0530 Subject: [PATCH 2/6] updated gradle --- .gitignore | 40 +-- .idea/.name | 1 - .idea/compiler.xml | 22 -- .idea/copyright/profiles_settings.xml | 3 - .idea/encodings.xml | 6 - .idea/gradle.xml | 23 -- .idea/misc.xml | 162 --------- .idea/modules.xml | 10 - .idea/runConfigurations.xml | 12 - .idea/sonarIssues.xml | 29 -- .idea/vcs.xml | 6 - CursorWheelLayout.iml | 3 +- app/app.iml | 330 +----------------- app/build.gradle | 33 +- .../cursorwheellayout/MainActivity.java | 3 +- .../adapter/SimpleTextAdapter.java | 3 +- .../widget/SwitchButton.java | 3 +- app/src/main/res/layout/activity_main.xml | 133 ++++--- build.gradle | 7 +- gradle.properties | 7 +- library/build.gradle | 17 +- library/library.iml | 327 +---------------- .../cursorwheel/CursorWheelLayout.java | 24 +- 23 files changed, 139 insertions(+), 1065 deletions(-) delete mode 100644 .idea/.name delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/runConfigurations.xml delete mode 100644 .idea/sonarIssues.xml delete mode 100644 .idea/vcs.xml diff --git a/.gitignore b/.gitignore index 874df11..8927af0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,35 +1,19 @@ +*.iml .gradle /local.properties -/.idea/workspace.xml +/.idea/caches /.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml .DS_Store /build /captures - - -# Files for the Dalvik VM -*.dex - -# Java class files -*.class - -# Generated files -bin/ -gen/ - -# Gradle files -.gradle/ -build/ -/*/build/ - -# Local configuration file (sdk path, etc) +.externalNativeBuild +.cxx local.properties - -# Proguard folder generated by Eclipse -proguard/ - -# Log Files -*.log - -# Svn -.svn/ \ No newline at end of file +/.idea/ +/gradle/wrapper/ +/gradlew.bat +/gradlew diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index d6179d4..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -CursorWheelLayout \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 96cc43e..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 97626ba..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 7d55b84..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index a846f05..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,162 +0,0 @@ - - - - - - - - - - - - - - - - - - Android - - - Android > Lint > Correctness - - - Android > Lint > Correctness > Messages - - - Android > Lint > Internationalization - - - Android > Lint > Security - - - Android > Lint > Usability - - - Android > Lint > Usability > Icons - - - C/C++ - - - Class structureJava - - - Control flow issuesJava - - - Error handlingJava - - - General - - - Groovy - - - HTML - - - ImportsJava - - - Internationalization issues - - - Internationalization issuesJava - - - J2ME issuesJava - - - JSON - - - Java - - - Javadoc issuesJava - - - Manifest - - - OtherGroovy - - - Portability issuesJava - - - Potentially confusing code constructsGroovy - - - Probable bugsJava - - - Properties Files - - - Properties FilesJava - - - RELAX NG - - - Resource management issuesJava - - - TestNGJava - - - Threading issuesJava - - - Unused codeC/C++ - - - Validity issuesGroovy - - - XML - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index b9eeaab..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/sonarIssues.xml b/.idea/sonarIssues.xml deleted file mode 100644 index 59f6a7f..0000000 --- a/.idea/sonarIssues.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/CursorWheelLayout.iml b/CursorWheelLayout.iml index ceef0db..47d5882 100644 --- a/CursorWheelLayout.iml +++ b/CursorWheelLayout.iml @@ -8,10 +8,11 @@ - + + diff --git a/app/app.iml b/app/app.iml index 020e244..e0955a4 100644 --- a/app/app.iml +++ b/app/app.iml @@ -1,333 +1,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +