DROID-1881 App | Tech | AGP Update (8.1.4) (#579)

2025-06-07 21:37:02 +09:00 · 2023-11-21 11:27:27 +01:00 · 2023-11-21 11:27:27 +01:00 · 10db9cc9e7
commit 10db9cc9e7
parent 47d41af9bd
42 changed files with 92 additions and 30 deletions
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@ -9,8 +9,12 @@ jobs:
  setup-android:
    runs-on: ubuntu-latest
    steps:
+      -  uses: actions/checkout@v3
+      -  uses: actions/setup-java@v3
+         with:
+          distribution: "zulu"
+          java-version: 17

-      - uses: actions/checkout@master
      - name: Setup middleware dependency
        env:
          token_secret: ${{ secrets.ANYTYPE_SECRET }}
--- a/.github/workflows/nightly-debug-builds.yml
+++ b/.github/workflows/nightly-debug-builds.yml
@ -7,7 +7,12 @@ jobs:
  setup-android:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: "zulu"
+          java-version: 17
+
      - name: Setup middleware dependency
        env:
          token_secret: ${{ secrets.ANYTYPE_SECRET }}
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -5,7 +5,12 @@ jobs:
  setup-android:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: "zulu"
+          java-version: 17
+
      - name: Setup middleware dependency
        env:
          token_secret: ${{ secrets.ANYTYPE_SECRET }}
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@ -7,7 +7,12 @@ jobs:
    runs-on: ubuntu-latest
    steps:

-      - uses: actions/checkout@master
+      -  uses: actions/checkout@v3
+      -  uses: actions/setup-java@v3
+         with:
+           distribution: "zulu"
+           java-version: 17
+
      - name: Setup middleware dependency
        env:
          token_secret: ${{ secrets.ANYTYPE_SECRET }}
--- a/analytics/build.gradle
+++ b/analytics/build.gradle
@ -13,6 +13,7 @@ android {
            buildConfigField "boolean", "SEND_EVENTS", getProperty('config.enableAnalyticsForDebugBuilds')
        }
    }
+    namespace 'com.anytypeio.anytype.analytics'
 }

 dependencies {
--- a/analytics/src/main/AndroidManifest.xml
+++ b/analytics/src/main/AndroidManifest.xml
@ -1 +1 @@
-<manifest package="com.anytypeio.anytype.analytics" />
+<manifest />
--- a/app/build.gradle
+++ b/app/build.gradle
@ -100,8 +100,12 @@ android {
    }

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
    }

    composeOptions {
@ -125,6 +129,7 @@ android {
    }

    ndkVersion "23.2.8568313"
+    namespace 'com.anytypeio.anytype'
 }

 kotlin {
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.anytypeio.anytype">
+    xmlns:tools="http://schemas.android.com/tools">

    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
--- a/clipboard/build.gradle
+++ b/clipboard/build.gradle
@ -15,6 +15,7 @@ android {
            buildConfigField ANYTYPE_CLIPBOARD_LABEL_TYPE, ANYTYPE_CLIPBOARD_LABEL, ANYTYPE_CLIPBOARD_LABEL_VALUE
        }
    }
+    namespace 'com.anytypeio.anytype.clipboard'
 }

 dependencies {
--- a/clipboard/src/main/AndroidManifest.xml
+++ b/clipboard/src/main/AndroidManifest.xml
@ -1 +1 @@
-<manifest package="com.anytypeio.anytype.clipboard" />
+<manifest />
--- a/core-models/src/main/AndroidManifest.xml
+++ b/core-models/src/main/AndroidManifest.xml
@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.anytypeio.anytype.core_models">
+<manifest>

 </manifest>
--- a/core-ui/build.gradle
+++ b/core-ui/build.gradle
@ -18,6 +18,7 @@ android {
        viewBinding true
        compose true
    }
+    namespace 'com.anytypeio.anytype.core_ui'
 }

 dependencies {
--- a/core-ui/src/main/AndroidManifest.xml
+++ b/core-ui/src/main/AndroidManifest.xml
@ -1 +1 @@
-<manifest package="com.anytypeio.anytype.core_ui" />
+<manifest />
--- a/core-utils/build.gradle
+++ b/core-utils/build.gradle
@ -12,6 +12,7 @@ android {
    buildFeatures {
        viewBinding true
    }
+    namespace 'com.anytypeio.anytype.core_utils'
 }

 dependencies {
--- a/core-utils/src/main/AndroidManifest.xml
+++ b/core-utils/src/main/AndroidManifest.xml
@ -1 +1 @@
-<manifest package="com.anytypeio.anytype.core_utils" />
+<manifest />
--- a/crash-reporting/build.gradle
+++ b/crash-reporting/build.gradle
@ -17,6 +17,7 @@ android {
        }
        includeDependenciesReport = true
    }
+    namespace 'com.anytypeio.anytype.crash_reporting'
 }

 dependencies {
--- a/crash-reporting/src/main/AndroidManifest.xml
+++ b/crash-reporting/src/main/AndroidManifest.xml
@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.anytypeio.anytype.crash_reporting"/>
+<manifest />
--- a/device/build.gradle
+++ b/device/build.gradle
@ -20,4 +20,8 @@ dependencies {
    testImplementation libs.robolectric

    compileOnly libs.javaxInject
+}
+
+android {
+    namespace 'com.anytypeio.anytype.device'
 }
--- a/device/src/main/AndroidManifest.xml
+++ b/device/src/main/AndroidManifest.xml
@ -1 +1 @@
-<manifest package="com.anytypeio.anytype.device" />
+<manifest />
--- a/gradle.properties
+++ b/gradle.properties
@ -22,3 +22,7 @@ kotlin.code.style=official

 kapt.incremental.apt=true
 org.gradle.unsafe.configuration-cache=true
+
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@ -161,8 +161,8 @@ appUpdater = { module = "com.github.PLPsiSoft:AndroidAppUpdater", version = "991
 [bundles]

 [plugins]
-application = { id = "com.android.application", version = "7.4.2" }
-library = { id = "com.android.library", version = "7.4.2" }
+application = { id = "com.android.application", version = "8.1.4" }
+library = { id = "com.android.library", version = "8.1.4" }
 kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinVersion" }
 dokka = { id = "org.jetbrains.dokka", version.ref = "kotlinVersion" }
 kserialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlinVersion" }
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/library-emojifier/build.gradle
+++ b/library-emojifier/build.gradle
@ -13,4 +13,8 @@ dependencies {

    testImplementation libs.junit
    testImplementation libs.kotlinTest
+}
+
+android {
+    namespace 'com.anytypeio.anytype.emojifier'
 }
--- a/library-emojifier/src/main/AndroidManifest.xml
+++ b/library-emojifier/src/main/AndroidManifest.xml
@ -1 +1 @@
-<manifest package="com.anytypeio.anytype.emojifier" />
+<manifest />
--- a/library-page-icon-picker-widget/build.gradle
+++ b/library-page-icon-picker-widget/build.gradle
@ -7,6 +7,7 @@ android {
    buildFeatures {
        viewBinding true
    }
+    namespace 'com.anytypeio.anytype.library_page_icon_picker_widget'
 }

 dependencies {
--- a/library-page-icon-picker-widget/src/main/AndroidManifest.xml
+++ b/library-page-icon-picker-widget/src/main/AndroidManifest.xml
@ -1 +1 @@
-<manifest package="com.anytypeio.anytype.library_page_icon_picker_widget" />
+<manifest />
--- a/library-syntax-highlighter/build.gradle
+++ b/library-syntax-highlighter/build.gradle
@ -17,4 +17,8 @@ dependencies {
    testImplementation libs.kotlinTest
    testImplementation libs.robolectric
    testImplementation libs.androidXTestCore
+}
+
+android {
+    namespace 'com.anytypeio.anytype.library_syntax_highlighter'
 }
--- a/library-syntax-highlighter/src/main/AndroidManifest.xml
+++ b/library-syntax-highlighter/src/main/AndroidManifest.xml
@ -1 +1 @@
-<manifest package="com.anytypeio.anytype.library_syntax_highlighter" />
+<manifest />
--- a/middleware/build.gradle
+++ b/middleware/build.gradle
@ -23,4 +23,8 @@ dependencies {
    testImplementation libs.junit
    testImplementation libs.kotlinTest
    testImplementation libs.mockitoKotlin
+}
+
+android {
+    namespace 'com.anytypeio.anytype.middleware'
 }
--- a/middleware/src/main/AndroidManifest.xml
+++ b/middleware/src/main/AndroidManifest.xml
@ -1 +1 @@
-<manifest package="com.anytypeio.anytype.middleware" />
+<manifest />
--- a/persistence/build.gradle
+++ b/persistence/build.gradle
@ -31,4 +31,8 @@ dependencies {
    testImplementation libs.robolectric
    testImplementation libs.archCoreTesting
    testImplementation libs.coroutineTesting
+}
+
+android {
+    namespace 'com.anytypeio.anytype.persistence'
 }
--- a/persistence/src/main/AndroidManifest.xml
+++ b/persistence/src/main/AndroidManifest.xml
@ -1 +1 @@
-<manifest package="com.anytypeio.anytype.persistence" />
+<manifest />
--- a/presentation/build.gradle
+++ b/presentation/build.gradle
@ -13,6 +13,7 @@ android {
        buildConfigField "boolean", "ENABLE_WIDGETS", "false"
        buildConfigField "boolean", "ENABLE_VIEWS_MENU", "true"
    }
+    namespace 'com.anytypeio.anytype.presentation'
 }

 dependencies {
--- a/presentation/src/main/AndroidManifest.xml
+++ b/presentation/src/main/AndroidManifest.xml
@ -1 +1 @@
-<manifest package="com.anytypeio.anytype.presentation" />
+<manifest />
--- a/protocol/build.gradle
+++ b/protocol/build.gradle
@ -11,4 +11,8 @@ dependencies {
 wire {
    protoPath { srcDir 'src/main/proto' }
    kotlin {}
+}
+
+android {
+    namespace 'com.anytypeio.anytype.protocol'
 }
--- a/protocol/src/main/AndroidManifest.xml
+++ b/protocol/src/main/AndroidManifest.xml
@ -1,4 +1,4 @@
-<manifest package="com.anytypeio.anytype.protocol">
+<manifest>

    /
 </manifest>
--- a/sample/build.gradle
+++ b/sample/build.gradle
@ -47,6 +47,7 @@ android {
    composeOptions {
        kotlinCompilerExtensionVersion libs.versions.composeKotlinCompilerVersion.get()
    }
+    namespace 'com.anytypeio.anytype.sample'
 }

 dependencies {
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.anytypeio.anytype.sample">
+    xmlns:tools="http://schemas.android.com/tools">

    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
--- a/test/android-utils/build.gradle
+++ b/test/android-utils/build.gradle
@ -12,4 +12,8 @@ dependencies {
    implementation libs.androidxCore
    implementation libs.design
    implementation libs.recyclerView
+}
+
+android {
+    namespace 'com.anytypeio.anytype.test_utils'
 }
--- a/test/android-utils/src/main/AndroidManifest.xml
+++ b/test/android-utils/src/main/AndroidManifest.xml
@ -1 +1 @@
-<manifest package="com.anytypeio.anytype.test_utils" />
+<manifest />
--- a/ui-settings/build.gradle
+++ b/ui-settings/build.gradle
@ -14,6 +14,7 @@ android {
    composeOptions {
        kotlinCompilerExtensionVersion libs.versions.composeKotlinCompilerVersion.get()
    }
+    namespace 'com.anytypeio.anytype.ui_settings'
 }

 dependencies {
--- a/ui-settings/src/main/AndroidManifest.xml
+++ b/ui-settings/src/main/AndroidManifest.xml
@ -1 +1 @@
-<manifest package="com.anytypeio.anytype.ui_settings"/>
+<manifest />