Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
.cxx

local.properties
keystore.properties
metasearch.jks

**/*.pro

Expand Down
2 changes: 1 addition & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
}

android {
namespace = "com.example.metasearch"
namespace = "com.metasearch.android"
}

ksp {
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<uses-permission android:name="android.permission.READ_CONTACTS" />

<application
android:name="com.example.metasearch.App"
android:name="com.metasearch.android.App"
android:allowBackup="false"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
Expand All @@ -24,6 +24,7 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.MetaSearch"
android:usesCleartextTraffic="true"
android:networkSecurityConfig="@xml/network_security_config">

</application>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.metasearch
package com.metasearch.android

import android.app.Application
import dagger.hilt.android.HiltAndroidApp
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.metasearch.di
package com.metasearch.android.di

import com.slack.circuit.foundation.Circuit
import com.slack.circuit.runtime.presenter.Presenter
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import com.android.build.api.dsl.ApplicationExtension
import com.example.metasearch.convention.Plugins
import com.example.metasearch.convention.configureCompose
import com.metasearch.android.convention.Plugins
import com.metasearch.android.convention.configureCompose
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.configure
Expand Down
10 changes: 5 additions & 5 deletions build-logic/src/main/java/AndroidApplicationConventionPlugin.kt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import com.android.build.api.dsl.ApplicationExtension
import com.example.metasearch.convention.ExtensionType
import com.example.metasearch.convention.Plugins
import com.example.metasearch.convention.configureBuildTypes
import com.example.metasearch.convention.configureKotlinAndroid
import com.example.metasearch.convention.libs
import com.metasearch.android.convention.ExtensionType
import com.metasearch.android.convention.Plugins
import com.metasearch.android.convention.configureBuildTypes
import com.metasearch.android.convention.configureKotlinAndroid
import com.metasearch.android.convention.libs
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.configure
Expand Down
10 changes: 5 additions & 5 deletions build-logic/src/main/java/AndroidFeatureConventionPlugin.kt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.dependencies
import com.example.metasearch.convention.implementation
import com.example.metasearch.convention.api
import com.example.metasearch.convention.implementationProject
import com.example.metasearch.convention.libs
import com.example.metasearch.convention.ksp
import com.metasearch.android.convention.implementation
import com.metasearch.android.convention.api
import com.metasearch.android.convention.implementationProject
import com.metasearch.android.convention.libs
import com.metasearch.android.convention.ksp

internal class AndroidFeatureConventionPlugin : Plugin<Project> {
override fun apply(target: Project) {
Expand Down
8 changes: 4 additions & 4 deletions build-logic/src/main/java/AndroidHiltConventionPlugin.kt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import com.example.metasearch.convention.Plugins
import com.example.metasearch.convention.implementation
import com.example.metasearch.convention.libs
import com.example.metasearch.convention.ksp
import com.metasearch.android.convention.Plugins
import com.metasearch.android.convention.implementation
import com.metasearch.android.convention.libs
import com.metasearch.android.convention.ksp
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.dependencies
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import com.android.build.api.dsl.LibraryExtension
import com.example.metasearch.convention.Plugins
import com.example.metasearch.convention.configureCompose
import com.metasearch.android.convention.Plugins
import com.metasearch.android.convention.configureCompose
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.configure
Expand Down
11 changes: 5 additions & 6 deletions build-logic/src/main/java/AndroidLibraryConventionPlugin.kt
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import com.android.build.gradle.LibraryExtension
import com.example.metasearch.convention.ExtensionType
import com.example.metasearch.convention.Plugins
import com.example.metasearch.convention.configureBuildTypes
import com.example.metasearch.convention.libs
import com.example.metasearch.convention.configureKotlinAndroid
import com.metasearch.android.convention.ExtensionType
import com.metasearch.android.convention.Plugins
import com.metasearch.android.convention.configureBuildTypes
import com.metasearch.android.convention.libs
import com.metasearch.android.convention.configureKotlinAndroid
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.dependencies
import kotlin.text.toInt

internal class AndroidLibraryConventionPlugin : Plugin<Project> {
Expand Down
4 changes: 2 additions & 2 deletions build-logic/src/main/java/AndroidRetrofitConventionPlugin.kt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.dependencies
import com.example.metasearch.convention.libs
import com.example.metasearch.convention.implementation
import com.metasearch.android.convention.libs
import com.metasearch.android.convention.implementation

internal class AndroidRetrofitConventionPlugin : Plugin<Project> {
override fun apply(target: Project) {
Expand Down
5 changes: 2 additions & 3 deletions build-logic/src/main/java/JvmLibraryConventionPlugin.kt
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import com.example.metasearch.convention.Plugins
import com.example.metasearch.convention.configureKotlinJvm
import com.metasearch.android.convention.Plugins
import com.metasearch.android.convention.configureKotlinJvm
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.dependencies

internal class JvmLibraryConventionPlugin : Plugin<Project> {
override fun apply(target: Project) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import com.example.metasearch.convention.Plugins
import com.example.metasearch.convention.implementation
import com.example.metasearch.convention.libs
import com.metasearch.android.convention.Plugins
import com.metasearch.android.convention.implementation
import com.metasearch.android.convention.libs
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.dependencies
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
package com.metasearch.android.convention

import com.android.build.api.dsl.ApplicationExtension
import com.android.build.api.dsl.CommonExtension
import com.android.build.api.dsl.LibraryExtension
import org.gradle.api.Project
import org.gradle.kotlin.dsl.configure
import java.util.Properties

internal fun Project.configureBuildTypes(
commonExtension: CommonExtension<*, *, *, *, *, *>,
extensionType: ExtensionType
) {
commonExtension.run {
buildFeatures {
buildConfig = true
}

buildTypes {
getByName("release") {
isMinifyEnabled = false
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
}
}
}

when (extensionType) {
ExtensionType.APPLICATION -> {
extensions.configure<ApplicationExtension> {
signingConfigs {
create("release") {
val propertiesFile = rootProject.file("keystore.properties")
if (propertiesFile.exists()) {
val properties = Properties()
properties.load(propertiesFile.inputStream())
storeFile = rootProject.file(properties["STORE_FILE"] as String)
storePassword = properties["STORE_PASSWORD"] as String
keyAlias = properties["KEY_ALIAS"] as String
keyPassword = properties["KEY_PASSWORD"] as String
}
}
}

buildTypes {
getByName("release") {
isShrinkResources = false
signingConfig = signingConfigs.getByName("release")
}
}
}
}

ExtensionType.LIBRARY -> {
extensions.configure<LibraryExtension> {
buildTypes {
getByName("release") { }
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.metasearch.convention
package com.metasearch.android.convention

import com.android.build.api.dsl.CommonExtension
import org.gradle.api.Project
Expand All @@ -18,4 +18,4 @@ internal fun Project.configureCompose(
debugImplementation(libs.androidx.compose.ui.tooling)
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.metasearch.convention
package com.metasearch.android.convention

import org.gradle.api.artifacts.Dependency
import org.gradle.api.artifacts.dsl.DependencyHandler
Expand Down Expand Up @@ -26,4 +26,4 @@ fun DependencyHandler.debugImplementation(dependencyNotation: Any): Dependency?

fun DependencyHandler.implementationProject(path: String): Dependency? {
return add("implementation", project(path))
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.metasearch.convention
package com.metasearch.android.convention

enum class ExtensionType {
APPLICATION,
LIBRARY
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.example.metasearch.convention
package com.metasearch.android.convention

import org.gradle.accessors.dm.LibrariesForLibs
import org.gradle.api.Project
import org.gradle.kotlin.dsl.the

internal val Project.libs
get() = the<LibrariesForLibs>()
get() = the<LibrariesForLibs>()
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.metasearch.convention
package com.metasearch.android.convention

import com.android.build.api.dsl.CommonExtension
import org.gradle.api.JavaVersion
Expand Down Expand Up @@ -40,4 +40,4 @@ private fun Project.configureKotlin() {
jvmTarget.set(JvmTarget.JVM_11)
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.metasearch.convention
package com.metasearch.android.convention

object Plugins {
const val ANDROID_APPLICATION = "com.android.application"
Expand All @@ -11,4 +11,4 @@ object Plugins {

const val KSP = "com.google.devtools.ksp"
const val HILT = "dagger.hilt.android.plugin"
}
}
2 changes: 1 addition & 1 deletion core/common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
}

android {
namespace = "com.example.metasearch.core.common"
namespace = "com.metasearch.android.core.common"
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.metasearch.core.common.constants
package com.metasearch.android.core.common.constants

enum class ErrorScope {
GLOBAL,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.metasearch.core.common.constants
package com.metasearch.android.core.common.constants

object PromptConstants {
const val NL_SEARCH_BASIC_PROMPT = """
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.metasearch.core.common.extensions
package com.metasearch.android.core.common.extensions

import androidx.compose.foundation.clickable
import androidx.compose.ui.Modifier
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.metasearch.core.common.extensions
package com.metasearch.android.core.common.extensions

import android.content.Context
import android.net.Uri
Expand Down
Loading