gradle fixes

build.gradle

@@ -3,10 +3,10 @@
 apply from: 'jacoco/project.gradle'
 
 buildscript {
-    ext.kotlin_version = '1.7.10'
-    ext.android_tools_gradle = '8.0.0'
+    ext.kotlin_version = '1.5.10'
+    ext.android_tools_gradle = '4.2.0'
     ext.screen_shot_plugin = '0.14.0'
-    ext.dokka_version_plugin = '1.7.0'
+    ext.dokka_version_plugin = '1.5.31'
     ext.lintVersion = '27.2.1'
 
     repositories {
@@ -55,8 +55,8 @@ ext {
     // Sdk and tools
     minSdkVersion = 21
     targetSdkVersion = 34
-    compileSdkVersion = 34
-    buildToolsVersion = '34.0.0'
+    compileSdkVersion = 31
+    buildToolsVersion = '30.0.3'
 
     // App dependencies
     constraintLayout = '2.1.2'
@@ -74,5 +74,5 @@ ext {
     mockKVersion = '1.10.0'
     coreKTXVersion = '1.3.0'
     coilVersion = "1.3.2"
-    composeVersion = "1.3.0"
+    composeVersion = "1.0.0"
 }

designsystem/build.gradle

@@ -13,6 +13,9 @@ android {
     compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolsVersion
 
+    aaptOptions {
+        cruncherEnabled = false
+    }
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
@@ -36,11 +39,11 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = "1.8"
     }
 
     composeOptions {
@@ -61,16 +64,15 @@ android {
         test.java.srcDirs += 'src/test/kotlin'
     }
 
+    lintOptions {
+        baseline file("lint-baseline.xml")
+        checkReleaseBuilds false
+    }
 
     testOptions {
         unitTests.includeAndroidResources = true
         unitTests.returnDefaultValues = true
     }
-    namespace 'com.natura.android'
-    lint {
-        baseline file('lint-baseline.xml')
-        checkReleaseBuilds false
-    }
 
     buildFeatures {
         compose = true

designsystem/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.natura.android"
     android:sharedUserId="com.natura.android.designsystem.uid">
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.VIBRATE" />

designsystem/src/main/kotlin/com/natura/android/badge/BadgeDrawable.kt

@@ -77,7 +77,6 @@ class BadgeDrawable(
 
     override fun setColorFilter(cf: ColorFilter?) {}
 
-    @Deprecated("Deprecated in Java")
     override fun getOpacity() = PixelFormat.UNKNOWN
 
     fun updateBadgeDrawable(count: Int) {

designsystem/src/main/kotlin/com/natura/android/badge/GaYaBadgeDrawable.kt

@@ -71,7 +71,6 @@ class GaYaBadgeDrawable(
 
     override fun setColorFilter(cf: ColorFilter?) {}
 
-    @Deprecated("Deprecated in Java")
     override fun getOpacity() = PixelFormat.UNKNOWN
 
     fun updateBadgeDrawable(count: Int) {

designsystem/src/main/kotlin/com/natura/android/chip/GaYaChip.kt

@@ -45,60 +45,58 @@ class GaYaChip : ConstraintLayout {
     private lateinit var typedArray: TypedArray
 
     var label: String = ""
-        @JvmName("internalSetLabel")
         set(value) {
             field = value
             setContentLabel(value)
             configureAppearance(getDrawable())
         }
 
     var size: Int = SEMI
-        @JvmName("internalSetSize")
         set(value) {
             field = value
             configureSize(getDrawable())
             configureAppearance(getDrawable())
         }
 
+    var isSelected: Boolean = false
+        set(value) {
+            field = value
+            configureAppearance(getDrawable())
+        }
+
     var isComponentEnabled: Boolean = true
 
     var color: Int = PRIMARY
-        @JvmName("internalSetColor")
         set(value) {
             field = value
             configureAppearance(getDrawable())
         }
 
     var helperRightType: Int = NONE_TYPE
-        @JvmName("internalSetHelperRightType")
         set(value) {
             field = value
             configureHelpers()
         }
 
     var helperLeftType: Int = NONE_TYPE
-        @JvmName("internalSetHelperLeftType")
         set(value) {
             field = value
             configureHelpers()
         }
 
     var helperLeft: Int = RESOURCE_NOT_DEFINED
-        @JvmName("internalSetHelperLeft")
         set(value) {
             field = value
             configureHelpers()
         }
 
     var helperRight: Int = RESOURCE_NOT_DEFINED
-        @JvmName("internalSetHelperRight")
         set(value) {
             field = value
             configureHelpers()
         }
 
     var hasAction: Boolean = false
-        @JvmName("internalSetHasAction")
         set(value) {
             field = value
             configureAction()
@@ -128,7 +126,8 @@ class GaYaChip : ConstraintLayout {
 
         mainContainer.setOnClickListener {
             if (!hasAction) {
-                toggleSelection()
+                isSelected = !isSelected
+                configureAppearance(getDrawable())
             }
         }
 
@@ -147,11 +146,6 @@ class GaYaChip : ConstraintLayout {
         super.setEnabled(enabled)
     }
 
-    private fun toggleSelection() {
-        isSelected = !isSelected
-        configureAppearance(getDrawable())
-    }
-
     fun setSize(size: Int) {
         this.size = size
         configureSize(getDrawable())

gradle.properties

@@ -19,6 +19,3 @@ android.useAndroidX=true
 android.enableJetifier=false
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-android.defaults.buildfeatures.buildconfig=true
-android.nonTransitiveRClass=false
-android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Wed Dec 22 10:26:50 BRT 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

jacoco/modules.gradle

@@ -17,9 +17,8 @@ project.afterEvaluate {
         description = "Generate Jacoco coverage reports for the debug build."
 
         reports {
-            xml.required.set(false)
-            csv.required.set(false)
-            html.required.set(true)
+            html.enabled = true
+            xml.enabled = true
         }
 
         def excludes = [

jacoco/project.gradle

@@ -17,9 +17,8 @@ project.afterEvaluate {
         description = "Generate overall Jacoco coverage report for the debug build."
 
         reports {
-            xml.required.set(false)
-            csv.required.set(false)
-            html.required.set(true)
+            html.enabled = true
+            xml.enabled = true
         }
 
         def excludes = [

lint/build.gradle

@@ -31,8 +31,8 @@ dependencies {
     testImplementation("junit:junit:$junitVersion")
 }
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 jar {

sample/build.gradle

@@ -20,6 +20,9 @@ android {
         vectorDrawables.useSupportLibrary = true
     }
 
+    aaptOptions {
+        cruncherEnabled = false
+    }
 
     buildTypes {
         release {
@@ -50,9 +53,10 @@ android {
             unitTests.returnDefaultValues = true
         }
     }
-    namespace 'com.natura.android.sample'
-    testNamespace 'com.natura.android.sample.screenshottests'
 
+    lintOptions {
+        tasks.lint.enabled = false
+    }
 
     kapt.includeCompileClasspath = false
 }

sample/src/androidTest/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    android:sharedUserId="com.natura.android.designsystem.uid">
-
+    android:sharedUserId="com.natura.android.designsystem.uid"
+    package="com.natura.android.sample.screenshottests">
     <!-- needed for screenshot test library -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <application android:requestLegacyExternalStorage="true"/>

sample/src/main/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    android:sharedUserId="com.natura.android.designsystem.uid">
+    android:sharedUserId="com.natura.android.designsystem.uid"
+    package="com.natura.android.sample">
 
     <application
         android:allowBackup="true"

sample/src/test/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    android:sharedUserId="com.natura.android.designsystem.uid">
-
+    android:sharedUserId="com.natura.android.designsystem.uid"
+    package="com.natura.android.sample.screenshottests">
     <!-- needed for screenshot test library -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <application android:requestLegacyExternalStorage="true"/>