Skip to content

Commit 2649e51

Browse files
mupandrehgdias
mup
authored andcommitted
Create tutashared and remove shared code from Calendar
This commit moves code that can be shared between Calendar and Mail app to a shared module. Also creates a ModuleBuildConfig to share build configs between Apps and Module.
1 parent ce505ea commit 2649e51

File tree

193 files changed

+3684
-1986
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

193 files changed

+3684
-1986
lines changed

app-android/calendar/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ android {
5959
isJniDebuggable = true
6060
}
6161
release {
62+
manifestPlaceholders += mapOf()
6263
isMinifyEnabled = true
6364
resValue("string", "package_name", "de.tutao.calendar")
64-
setProguardFiles(listOf(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"))
6565
manifestPlaceholders["contentProviderAuthority"] = "de.tutao.fileprovider"
6666

6767
}
@@ -130,6 +130,7 @@ android {
130130
}
131131

132132
dependencies {
133+
implementation(project(":tutashared"))
133134
val room_version = "2.4.2"
134135
val lifecycle_version = "2.4.1"
135136
val activity_version = "1.4.0"

app-android/calendar/proguard-rules.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
# If you have any, uncomment and replace classes with those containing named companion objects.
6565
-keepattributes InnerClasses # Needed for `getDeclaredClasses`.
6666
-if @kotlinx.serialization.Serializable class
67-
de.tutao.calendar.IdTuple # <-- List serializable classes with named companions.
67+
de.tutao.tutashared.IdTuple # <-- List serializable classes with named companions.
6868
{
6969
static **$* *;
7070
}

app-android/calendar/src/main/java/de/tutao/calendar/AndroidCommonSystemFacade.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
package de.tutao.calendar
22

3-
import de.tutao.calendar.ipc.CommonSystemFacade
4-
import de.tutao.calendar.ipc.SqlCipherFacade
3+
import de.tutao.tutashared.TempDir
4+
import de.tutao.tutashared.ipc.CommonSystemFacade
5+
import de.tutao.tutashared.ipc.SqlCipherFacade
56
import kotlinx.coroutines.CompletableDeferred
67
import org.apache.commons.io.IOUtils
78
import java.io.File
89
import java.nio.charset.Charset
910
import kotlin.random.Random
1011

1112
class AndroidCommonSystemFacade(
12-
private val activity: MainActivity,
13-
private val sqlCipherFacade: SqlCipherFacade,
14-
private val tempDir: TempDir
13+
private val activity: MainActivity,
14+
private val sqlCipherFacade: SqlCipherFacade,
15+
private val tempDir: TempDir
1516
) : CommonSystemFacade {
1617

1718
@Volatile

0 commit comments

Comments
 (0)