Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 8798df32 authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé Committed by GitHub
Browse files

Merge pull request #8153 from wmontwe/add-billing-module-for-tb-daily 

Add basic feature setup for funding and Google Play billing support
parents a5d7ee87 e7e75205

app-k9mail/build.gradle.kts

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ dependencies { 
    implementation(projects.feature.widget.shortcut)

    implementation(projects.feature.widget.unread)

    implementation(projects.feature.telemetry.noop)

    implementation(projects.feature.funding.noop)



    implementation(libs.androidx.work.runtime)

app-k9mail/src/main/kotlin/app/k9mail/K9KoinModule.kt

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ import app.k9mail.core.featureflag.FeatureFlagFactory 
import app.k9mail.core.ui.theme.api.FeatureThemeProvider

import app.k9mail.core.ui.theme.api.ThemeProvider

import app.k9mail.dev.developmentModuleAdditions

import app.k9mail.feature.funding.featureFundingModule

import app.k9mail.feature.telemetry.telemetryModule

import app.k9mail.feature.widget.shortcut.LauncherShortcutActivity

import app.k9mail.featureflag.K9FeatureFlagFactory
@@ -26,6 +27,7 @@ import org.koin.dsl.module 
val appModule = module {

    includes(appWidgetModule)

    includes(telemetryModule)

    includes(featureFundingModule)



    single(named("ClientInfoAppName")) { BuildConfig.CLIENT_INFO_APP_NAME }

    single(named("ClientInfoAppVersion")) { BuildConfig.VERSION_NAME }

app-thunderbird/build.gradle.kts

+5 −0
Original line number Diff line number Diff line
@@ -198,6 +198,11 @@ dependencies { 
    debugImplementation(projects.backend.demo)

    debugImplementation(projects.feature.autodiscovery.demo)



    debugImplementation(projects.feature.funding.noop)

    add("dailyImplementation", projects.feature.funding.googleplay)

    add("betaImplementation", projects.feature.funding.noop)

    releaseImplementation(projects.feature.funding.noop)



    testImplementation(libs.robolectric)



    // Required for DependencyInjectionTest to be able to resolve OpenPgpApiManager

app-thunderbird/src/main/kotlin/net/thunderbird/android/ThunderbirdKoinModule.kt

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ import app.k9mail.core.common.provider.AppNameProvider 
import app.k9mail.core.featureflag.FeatureFlagFactory

import app.k9mail.core.ui.theme.api.FeatureThemeProvider

import app.k9mail.core.ui.theme.api.ThemeProvider

import app.k9mail.feature.funding.featureFundingModule

import app.k9mail.feature.telemetry.telemetryModule

import app.k9mail.feature.widget.shortcut.LauncherShortcutActivity

import com.fsck.k9.AppConfig
@@ -25,6 +26,7 @@ import org.koin.dsl.module 
val appModule = module {

    includes(appWidgetModule)

    includes(telemetryModule)

    includes(featureFundingModule)



    single(named("ClientInfoAppName")) { BuildConfig.CLIENT_INFO_APP_NAME }

    single(named("ClientInfoAppVersion")) { BuildConfig.VERSION_NAME }

feature/funding/api/build.gradle.kts

0 → 100644
+4 −0
Original line number Diff line number Diff line 
plugins {

    id(ThunderbirdPlugins.Library.jvm)

    alias(libs.plugins.android.lint)

}