From 57ad29f2c4ec5fa4b987a7d2eabe1fa19bcca3d3 Mon Sep 17 00:00:00 2001 From: germainkevinbusiness <67168053+kevingermainbusiness@users.noreply.github.com> Date: Wed, 5 Jan 2022 12:22:39 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=80=20Added=20support=20for=20Java=208?= =?UTF-8?q?=20=E2=9C=A8=20Added=20support=20for=20Android=20SDK=2031=20?= =?UTF-8?q?=E2=9C=85=20Added=20the=20latest=20stable=20gradle-wrapper.prop?= =?UTF-8?q?erties=20=F0=9F=98=84=20Updated=20dependencies=20to=20the=20lat?= =?UTF-8?q?est=20stable=20versions=20=F0=9F=91=8C=20Tested=20the=20whole?= =?UTF-8?q?=20project=20in=20portrait=20&=20landscape=20mode=20on=20an=20A?= =?UTF-8?q?ndroid=20Studio=20Emulator=20&=20it=20works=20as=20it=20should?= =?UTF-8?q?=20!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.name | 1 - .idea/codeStyles/Project.xml | 122 ------------------ .idea/codeStyles/codeStyleConfig.xml | 5 - .idea/gradle.xml | 21 --- .idea/jarRepositories.xml | 30 ----- .idea/misc.xml | 4 - .idea/runConfigurations.xml | 12 -- .idea/vcs.xml | 6 - app/build.gradle | 31 +++-- app/src/main/AndroidManifest.xml | 4 +- .../com/validator/aliazaz/MainActivity.kt | 2 +- build.gradle | 9 +- gradle/wrapper/gradle-wrapper.properties | 2 +- validatorcrawler/build.gradle | 27 ++-- 14 files changed, 40 insertions(+), 236 deletions(-) delete mode 100644 .idea/.name delete mode 100644 .idea/codeStyles/Project.xml delete mode 100644 .idea/codeStyles/codeStyleConfig.xml delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/jarRepositories.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/runConfigurations.xml delete mode 100644 .idea/vcs.xml diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index f9766cc..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -ValidatorBox \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 88ea3aa..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
- - - - - - - \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index 79ee123..0000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 3cf4e8b..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index eb2873e..0000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 0d45e8d..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,4 +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/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 15290a0..3c26f80 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,23 +1,18 @@ apply plugin: 'com.android.application' - apply plugin: 'kotlin-android' - -apply plugin: 'kotlin-android-extensions' - apply plugin: 'kotlin-kapt' android { - compileSdkVersion 29 - buildToolsVersion '29.0.3' + compileSdkVersion 31 + buildToolsVersion '30.0.3' defaultConfig { applicationId "com.androidvalidatorcrawler.aliazaz" minSdkVersion 16 - targetSdkVersion 29 + targetSdkVersion 31 versionCode 1 versionName "1.0.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles 'consumer-rules.pro' } buildTypes { release { @@ -28,17 +23,25 @@ android { dataBinding { enabled = true } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = '1.8' + } } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.appcompat:appcompat:1.4.0' implementation 'androidx.cardview:cardview:1.0.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - testImplementation 'junit:junit:4.13' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.2' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' implementation "com.github.AliAzaz:Edittext-Library:2.0.0" implementation project(':validatorcrawler') diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 33ca973..cfa4afb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,7 +9,9 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - + diff --git a/app/src/main/java/com/validator/aliazaz/MainActivity.kt b/app/src/main/java/com/validator/aliazaz/MainActivity.kt index 6a03c27..91cbf98 100644 --- a/app/src/main/java/com/validator/aliazaz/MainActivity.kt +++ b/app/src/main/java/com/validator/aliazaz/MainActivity.kt @@ -9,7 +9,7 @@ import com.validator.aliazaz.databinding.ActivityMainBinding class MainActivity : AppCompatActivity(), MainInterface.viewInterface { - lateinit var bi: ActivityMainBinding + private lateinit var bi: ActivityMainBinding private val presenter: MainPresenter = MainPresenter(this, MainInteractor()) override fun onCreate(savedInstanceState: Bundle?) { diff --git a/build.gradle b/build.gradle index 3c884da..f02ee21 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,13 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.72' + ext.kotlin_version = '1.6.10' repositories { google() - jcenter() - + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.1' + classpath 'com.android.tools.build:gradle:7.0.4' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -18,7 +17,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() maven { url 'https://jitpack.io' } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6e31f7c..fb4edb1 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-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip diff --git a/validatorcrawler/build.gradle b/validatorcrawler/build.gradle index 85b85a2..598a7c9 100644 --- a/validatorcrawler/build.gradle +++ b/validatorcrawler/build.gradle @@ -1,16 +1,12 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 29 - buildToolsVersion '29.0.3' - + compileSdkVersion 31 + buildToolsVersion '30.0.3' defaultConfig { minSdkVersion 16 - targetSdkVersion 29 - versionCode 1 - versionName "1.0.3" + targetSdkVersion 31 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' @@ -22,24 +18,29 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } - lintOptions { abortOnError false } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } } ext { edittextpicker = '2.0.0' - appcompat = '1.1.0' - espresso = '3.2.0' - test = '1.1.1' - junit = '4.13' + appcompat = '1.4.0' + espresso = '3.4.0' + test = '1.1.3' + junit = '4.13.2' } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "androidx.appcompat:appcompat:$appcompat" testImplementation "junit:junit:$junit" androidTestImplementation "androidx.test.ext:junit:$test"