Update Gradle to 8.1 and AGP to v8.0 (#329)

* Update AGP to 8.0.0. * Set JAVA_HOME to JDK17 * Update lint version. * Use right JDK for dependency analysis, replace deprecated env var. * Upgrade to Gradle 8.1. * Remove `@Supress(DSL_SCOPE_VIOLATION)` as it's no longer needed. --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-04-17 10:49:52 +02:00 · 2023-04-17 10:49:52 +02:00 · de010545fb
commit de010545fb
parent 09a3999cc9
89 changed files with 99 additions and 153 deletions
--- a/libraries/androidutils/build.gradle.kts
+++ b/libraries/androidutils/build.gradle.kts
@ -14,7 +14,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 plugins {
    id("io.element.android-library")
 }
--- a/libraries/architecture/build.gradle.kts
+++ b/libraries/architecture/build.gradle.kts
@ -13,9 +13,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
-// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
    id("io.element.android-compose-library")
 }
--- a/libraries/core/build.gradle.kts
+++ b/libraries/core/build.gradle.kts
@ -13,9 +13,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
-// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
    id("java-library")
    id("com.android.lint")
@ -23,8 +20,8 @@ plugins {
 }

 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }

 dependencies {
--- a/libraries/coroutines/build.gradle.kts
+++ b/libraries/coroutines/build.gradle.kts
@ -13,16 +13,14 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
    id("java-library")
    alias(libs.plugins.kotlin.jvm)
 }

 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }

 dependencies {
--- a/libraries/dateformatter/api/build.gradle.kts
+++ b/libraries/dateformatter/api/build.gradle.kts
@ -14,8 +14,6 @@
 * limitations under the License.
 */

-// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
    id("io.element.android-library")
 }
--- a/libraries/dateformatter/impl/build.gradle.kts
+++ b/libraries/dateformatter/impl/build.gradle.kts
@ -14,8 +14,6 @@
 * limitations under the License.
 */

-// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
    id("io.element.android-library")
    alias(libs.plugins.ksp)
--- a/libraries/dateformatter/test/build.gradle.kts
+++ b/libraries/dateformatter/test/build.gradle.kts
@ -14,8 +14,6 @@
 * limitations under the License.
 */

-// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
    id("io.element.android-library")
 }
--- a/libraries/deeplink/build.gradle.kts
+++ b/libraries/deeplink/build.gradle.kts
@ -13,9 +13,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
-// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
    id("io.element.android-library")
    alias(libs.plugins.anvil)
--- a/libraries/designsystem/build.gradle.kts
+++ b/libraries/designsystem/build.gradle.kts
@ -14,8 +14,6 @@
 * limitations under the License.
 */

-// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
    id("io.element.android-compose-library")
    alias(libs.plugins.ksp)
@ -25,6 +23,10 @@ plugins {
 android {
    namespace = "io.element.android.libraries.designsystem"

+    buildFeatures {
+        buildConfig = true
+    }
+
    dependencies {
        // Should not be there, but this is a POC
        implementation(libs.coil.compose)
--- a/libraries/di/build.gradle.kts
+++ b/libraries/di/build.gradle.kts
@ -14,8 +14,6 @@
 * limitations under the License.
 */

-// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
    alias(libs.plugins.kotlin.jvm)
    id("com.android.lint")
--- a/libraries/elementresources/build.gradle.kts
+++ b/libraries/elementresources/build.gradle.kts
@ -13,7 +13,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 plugins {
    id("io.element.android-library")
 }
--- a/libraries/encrypted-db/build.gradle.kts
+++ b/libraries/encrypted-db/build.gradle.kts
@ -13,7 +13,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 plugins {
    id("io.element.android-library")
 }
--- a/libraries/matrix/api/build.gradle.kts
+++ b/libraries/matrix/api/build.gradle.kts
@ -14,8 +14,6 @@
 * limitations under the License.
 */

-// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
    id("io.element.android-library")
    id("kotlin-parcelize")
@ -25,6 +23,10 @@ plugins {

 android {
    namespace = "io.element.android.libraries.matrix.api"
+
+    buildFeatures {
+        buildConfig = true
+    }
 }

 anvil {
--- a/libraries/matrix/impl/build.gradle.kts
+++ b/libraries/matrix/impl/build.gradle.kts
@ -14,8 +14,6 @@
 * limitations under the License.
 */

-// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
    id("io.element.android-library")
    alias(libs.plugins.anvil)
--- a/libraries/matrix/test/build.gradle.kts
+++ b/libraries/matrix/test/build.gradle.kts
@ -14,8 +14,6 @@
 * limitations under the License.
 */

-// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
    id("io.element.android-library")
 }
--- a/libraries/matrixui/build.gradle.kts
+++ b/libraries/matrixui/build.gradle.kts
@ -14,8 +14,6 @@
 * limitations under the License.
 */

-// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
    id("io.element.android-compose-library")
    alias(libs.plugins.anvil)
--- a/libraries/network/build.gradle.kts
+++ b/libraries/network/build.gradle.kts
@ -13,7 +13,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 plugins {
    id("io.element.android-library")
    alias(libs.plugins.anvil)
--- a/libraries/permissions/api/build.gradle.kts
+++ b/libraries/permissions/api/build.gradle.kts
@ -13,7 +13,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 plugins {
    id("io.element.android-compose-library")
    alias(libs.plugins.ksp)
--- a/libraries/permissions/impl/build.gradle.kts
+++ b/libraries/permissions/impl/build.gradle.kts
@ -14,8 +14,6 @@
 * limitations under the License.
 */

-// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
    id("io.element.android-compose-library")
    alias(libs.plugins.anvil)
--- a/libraries/permissions/noop/build.gradle.kts
+++ b/libraries/permissions/noop/build.gradle.kts
@ -14,8 +14,6 @@
 * limitations under the License.
 */

-// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
    id("io.element.android-compose-library")
 }
--- a/libraries/push/api/build.gradle.kts
+++ b/libraries/push/api/build.gradle.kts
@ -13,7 +13,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 plugins {
    id("io.element.android-library")
 }
--- a/libraries/push/impl/build.gradle.kts
+++ b/libraries/push/impl/build.gradle.kts
@ -13,7 +13,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 plugins {
    id("io.element.android-library")
    alias(libs.plugins.anvil)
--- a/libraries/pushproviders/api/build.gradle.kts
+++ b/libraries/pushproviders/api/build.gradle.kts
@ -13,7 +13,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 plugins {
    id("io.element.android-library")
 }
--- a/libraries/pushproviders/firebase/build.gradle.kts
+++ b/libraries/pushproviders/firebase/build.gradle.kts
@ -13,7 +13,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 plugins {
    id("io.element.android-library")
    alias(libs.plugins.anvil)
--- a/libraries/pushproviders/unifiedpush/build.gradle.kts
+++ b/libraries/pushproviders/unifiedpush/build.gradle.kts
@ -13,7 +13,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 plugins {
    id("io.element.android-library")
    alias(libs.plugins.anvil)
--- a/libraries/pushstore/api/build.gradle.kts
+++ b/libraries/pushstore/api/build.gradle.kts
@ -13,7 +13,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 plugins {
    id("io.element.android-library")
 }
--- a/libraries/pushstore/impl/build.gradle.kts
+++ b/libraries/pushstore/impl/build.gradle.kts
@ -13,7 +13,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 plugins {
    id("io.element.android-library")
    alias(libs.plugins.anvil)
--- a/libraries/session-storage/api/build.gradle.kts
+++ b/libraries/session-storage/api/build.gradle.kts
@ -13,7 +13,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 plugins {
    id("io.element.android-library")
 }
--- a/libraries/session-storage/impl-memory/build.gradle.kts
+++ b/libraries/session-storage/impl-memory/build.gradle.kts
@ -13,7 +13,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 plugins {
    id("io.element.android-library")
 }
--- a/libraries/session-storage/impl/build.gradle.kts
+++ b/libraries/session-storage/impl/build.gradle.kts
@ -13,7 +13,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 plugins {
    id("io.element.android-library")
    alias(libs.plugins.anvil)
--- a/libraries/statemachine/build.gradle.kts
+++ b/libraries/statemachine/build.gradle.kts
@ -14,8 +14,6 @@
 * limitations under the License.
 */

-// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
    id("java-library")
    id("com.android.lint")
@ -23,8 +21,8 @@ plugins {
 }

 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }

 dependencies {
--- a/libraries/testtags/build.gradle.kts
+++ b/libraries/testtags/build.gradle.kts
@ -13,7 +13,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 plugins {
    id("io.element.android-compose-library")
 }
--- a/libraries/textcomposer/build.gradle.kts
+++ b/libraries/textcomposer/build.gradle.kts
@ -14,8 +14,6 @@
 * limitations under the License.
 */

-// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
    id("io.element.android-compose-library")
    alias(libs.plugins.ksp)
--- a/libraries/ui-strings/build.gradle.kts
+++ b/libraries/ui-strings/build.gradle.kts
@ -14,19 +14,10 @@
 * limitations under the License.
 */

-// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
    id("io.element.android-library")
-    alias(libs.plugins.stemlibrary)
 }

 android {
    namespace = "io.element.android.libraries.ui.strings"
 }
-
-// forcing the stem string template generator to be cacheable, without this the templates
-// are regenerated causing the app module to recompile its sources
-tasks.withType(com.likethesalad.android.templates.common.tasks.BaseTask::class.java) {
-    outputs.cacheIf { true }
-}