diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index bfd2462d39..bda2d0b72d 100644
--- 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 }}
diff --git a/.github/workflows/nightly-debug-builds.yml b/.github/workflows/nightly-debug-builds.yml
index bce232a9f8..0b6e780a16 100644
--- 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 }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c1a225e51c..0ecf8896dc 100644
--- 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 }}
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index a3889fd4e9..d54aacd71f 100644
--- 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 }}
diff --git a/analytics/build.gradle b/analytics/build.gradle
index ad429c1dfa..bb08a7c316 100644
--- 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 {
diff --git a/analytics/src/main/AndroidManifest.xml b/analytics/src/main/AndroidManifest.xml
index b64021b2e1..cc947c5679 100644
--- a/analytics/src/main/AndroidManifest.xml
+++ b/analytics/src/main/AndroidManifest.xml
@@ -1 +1 @@
-
+
diff --git a/app/build.gradle b/app/build.gradle
index 92b01094b3..e59860a015 100644
--- 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 {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a6859e37de..9557c5bb48 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
+ xmlns:tools="http://schemas.android.com/tools">
diff --git a/clipboard/build.gradle b/clipboard/build.gradle
index 8c9b56e158..acacc6b054 100644
--- 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 {
diff --git a/clipboard/src/main/AndroidManifest.xml b/clipboard/src/main/AndroidManifest.xml
index a15fad5b9c..cc947c5679 100644
--- a/clipboard/src/main/AndroidManifest.xml
+++ b/clipboard/src/main/AndroidManifest.xml
@@ -1 +1 @@
-
+
diff --git a/core-models/src/main/AndroidManifest.xml b/core-models/src/main/AndroidManifest.xml
index 8d9dbfe30e..44008a4332 100644
--- a/core-models/src/main/AndroidManifest.xml
+++ b/core-models/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-
+
\ No newline at end of file
diff --git a/core-ui/build.gradle b/core-ui/build.gradle
index 2364c387e2..3293f6148a 100644
--- 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 {
diff --git a/core-ui/src/main/AndroidManifest.xml b/core-ui/src/main/AndroidManifest.xml
index 6da6ace9ff..cc947c5679 100644
--- a/core-ui/src/main/AndroidManifest.xml
+++ b/core-ui/src/main/AndroidManifest.xml
@@ -1 +1 @@
-
+
diff --git a/core-utils/build.gradle b/core-utils/build.gradle
index a52cad264e..e4485412a4 100644
--- 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 {
diff --git a/core-utils/src/main/AndroidManifest.xml b/core-utils/src/main/AndroidManifest.xml
index e4a1178f43..cc947c5679 100644
--- a/core-utils/src/main/AndroidManifest.xml
+++ b/core-utils/src/main/AndroidManifest.xml
@@ -1 +1 @@
-
+
diff --git a/crash-reporting/build.gradle b/crash-reporting/build.gradle
index ebf1b6dc01..afa4ebe919 100644
--- a/crash-reporting/build.gradle
+++ b/crash-reporting/build.gradle
@@ -17,6 +17,7 @@ android {
}
includeDependenciesReport = true
}
+ namespace 'com.anytypeio.anytype.crash_reporting'
}
dependencies {
diff --git a/crash-reporting/src/main/AndroidManifest.xml b/crash-reporting/src/main/AndroidManifest.xml
index 367c72637a..568741e54f 100644
--- a/crash-reporting/src/main/AndroidManifest.xml
+++ b/crash-reporting/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/device/build.gradle b/device/build.gradle
index 52da2a994c..d4f8290b3e 100644
--- 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'
}
\ No newline at end of file
diff --git a/device/src/main/AndroidManifest.xml b/device/src/main/AndroidManifest.xml
index 2543e4ea4f..cc947c5679 100644
--- a/device/src/main/AndroidManifest.xml
+++ b/device/src/main/AndroidManifest.xml
@@ -1 +1 @@
-
+
diff --git a/gradle.properties b/gradle.properties
index e09d3e3892..907fa151e1 100644
--- 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
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f07df2a522..d526b57a78 100644
--- 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" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8fad3f5a98..3a02907943 100644
--- 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
diff --git a/library-emojifier/build.gradle b/library-emojifier/build.gradle
index 507962558c..659c8dc9d9 100644
--- 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'
}
\ No newline at end of file
diff --git a/library-emojifier/src/main/AndroidManifest.xml b/library-emojifier/src/main/AndroidManifest.xml
index 44c0316f4d..cc947c5679 100644
--- a/library-emojifier/src/main/AndroidManifest.xml
+++ b/library-emojifier/src/main/AndroidManifest.xml
@@ -1 +1 @@
-
+
diff --git a/library-page-icon-picker-widget/build.gradle b/library-page-icon-picker-widget/build.gradle
index 5555651558..719d89be42 100644
--- 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 {
diff --git a/library-page-icon-picker-widget/src/main/AndroidManifest.xml b/library-page-icon-picker-widget/src/main/AndroidManifest.xml
index 7b770ac977..cc947c5679 100644
--- a/library-page-icon-picker-widget/src/main/AndroidManifest.xml
+++ b/library-page-icon-picker-widget/src/main/AndroidManifest.xml
@@ -1 +1 @@
-
+
diff --git a/library-syntax-highlighter/build.gradle b/library-syntax-highlighter/build.gradle
index 6c548f41fa..b1801aa8ef 100644
--- 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'
}
\ No newline at end of file
diff --git a/library-syntax-highlighter/src/main/AndroidManifest.xml b/library-syntax-highlighter/src/main/AndroidManifest.xml
index 4185a0e43c..227314eeb7 100644
--- a/library-syntax-highlighter/src/main/AndroidManifest.xml
+++ b/library-syntax-highlighter/src/main/AndroidManifest.xml
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/middleware/build.gradle b/middleware/build.gradle
index 5da722f3b2..87ac892d65 100644
--- 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'
}
\ No newline at end of file
diff --git a/middleware/src/main/AndroidManifest.xml b/middleware/src/main/AndroidManifest.xml
index 329cb529a8..cc947c5679 100644
--- a/middleware/src/main/AndroidManifest.xml
+++ b/middleware/src/main/AndroidManifest.xml
@@ -1 +1 @@
-
+
diff --git a/persistence/build.gradle b/persistence/build.gradle
index 93d6193166..4333cf0522 100644
--- 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'
}
\ No newline at end of file
diff --git a/persistence/src/main/AndroidManifest.xml b/persistence/src/main/AndroidManifest.xml
index eb19e9a266..cc947c5679 100644
--- a/persistence/src/main/AndroidManifest.xml
+++ b/persistence/src/main/AndroidManifest.xml
@@ -1 +1 @@
-
+
diff --git a/presentation/build.gradle b/presentation/build.gradle
index 7a2b174588..8425d43e16 100644
--- 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 {
diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml
index e98c77e048..cc947c5679 100644
--- a/presentation/src/main/AndroidManifest.xml
+++ b/presentation/src/main/AndroidManifest.xml
@@ -1 +1 @@
-
+
diff --git a/protocol/build.gradle b/protocol/build.gradle
index 6f5ddc1757..69d1df09a7 100644
--- 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'
}
\ No newline at end of file
diff --git a/protocol/src/main/AndroidManifest.xml b/protocol/src/main/AndroidManifest.xml
index eb5fcb5a97..34353f7ccc 100644
--- a/protocol/src/main/AndroidManifest.xml
+++ b/protocol/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
-
+
/
\ No newline at end of file
diff --git a/sample/build.gradle b/sample/build.gradle
index ebf07824da..d10b1412c3 100644
--- 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 {
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index 03797c6b2c..664862658b 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
+ xmlns:tools="http://schemas.android.com/tools">
diff --git a/test/android-utils/build.gradle b/test/android-utils/build.gradle
index 35f67eab63..776e8c1f30 100644
--- 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'
}
\ No newline at end of file
diff --git a/test/android-utils/src/main/AndroidManifest.xml b/test/android-utils/src/main/AndroidManifest.xml
index 0b157bfa26..cc947c5679 100644
--- a/test/android-utils/src/main/AndroidManifest.xml
+++ b/test/android-utils/src/main/AndroidManifest.xml
@@ -1 +1 @@
-
+
diff --git a/ui-settings/build.gradle b/ui-settings/build.gradle
index e0fdd7777a..d99a1fa901 100644
--- 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 {
diff --git a/ui-settings/src/main/AndroidManifest.xml b/ui-settings/src/main/AndroidManifest.xml
index fa597c9982..227314eeb7 100644
--- a/ui-settings/src/main/AndroidManifest.xml
+++ b/ui-settings/src/main/AndroidManifest.xml
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file