Skip to content

Commit 3ae4170

Browse files
komodgnkomodgn
authored
Merge pull request #76 from komodgn/feature/#75
close #75 버전 업데이트 및 패지키명을 변경한다
2 parents efab3e3 + 985c786 commit 3ae4170

191 files changed

Lines changed: 741 additions & 858 deletions

File tree

Some content is hidden

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

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
.cxx
1515

1616
local.properties
17+
keystore.properties
18+
metasearch.jks
1719

1820
**/*.pro
1921

‎app/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
}
88

99
android {
10-
namespace = "com.example.metasearch"
10+
namespace = "com.metasearch.android"
1111
}
1212

1313
ksp {

‎app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<uses-permission android:name="android.permission.READ_CONTACTS" />
1616

1717
<application
18-
android:name="com.example.metasearch.App"
18+
android:name="com.metasearch.android.App"
1919
android:allowBackup="false"
2020
android:dataExtractionRules="@xml/data_extraction_rules"
2121
android:fullBackupContent="@xml/backup_rules"
@@ -24,6 +24,7 @@
2424
android:roundIcon="@mipmap/ic_launcher_round"
2525
android:supportsRtl="true"
2626
android:theme="@style/Theme.MetaSearch"
27+
android:usesCleartextTraffic="true"
2728
android:networkSecurityConfig="@xml/network_security_config">
2829

2930
</application>

app/src/main/java/com/example/metasearch/App.kt renamed to app/src/main/java/com/metasearch/android/App.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.metasearch
1+
package com.metasearch.android
22

33
import android.app.Application
44
import dagger.hilt.android.HiltAndroidApp

app/src/main/java/com/example/metasearch/di/CircuitModule.kt renamed to app/src/main/java/com/metasearch/android/di/CircuitModule.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.metasearch.di
1+
package com.metasearch.android.di
22

33
import com.slack.circuit.foundation.Circuit
44
import com.slack.circuit.runtime.presenter.Presenter

‎build-logic/src/main/java/AndroidApplicationComposeConventionPlugin.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import com.android.build.api.dsl.ApplicationExtension
2-
import com.example.metasearch.convention.Plugins
3-
import com.example.metasearch.convention.configureCompose
2+
import com.metasearch.android.convention.Plugins
3+
import com.metasearch.android.convention.configureCompose
44
import org.gradle.api.Plugin
55
import org.gradle.api.Project
66
import org.gradle.kotlin.dsl.configure

‎build-logic/src/main/java/AndroidApplicationConventionPlugin.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import com.android.build.api.dsl.ApplicationExtension
2-
import com.example.metasearch.convention.ExtensionType
3-
import com.example.metasearch.convention.Plugins
4-
import com.example.metasearch.convention.configureBuildTypes
5-
import com.example.metasearch.convention.configureKotlinAndroid
6-
import com.example.metasearch.convention.libs
2+
import com.metasearch.android.convention.ExtensionType
3+
import com.metasearch.android.convention.Plugins
4+
import com.metasearch.android.convention.configureBuildTypes
5+
import com.metasearch.android.convention.configureKotlinAndroid
6+
import com.metasearch.android.convention.libs
77
import org.gradle.api.Plugin
88
import org.gradle.api.Project
99
import org.gradle.kotlin.dsl.configure

‎build-logic/src/main/java/AndroidFeatureConventionPlugin.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import org.gradle.api.Plugin
22
import org.gradle.api.Project
33
import org.gradle.kotlin.dsl.dependencies
4-
import com.example.metasearch.convention.implementation
5-
import com.example.metasearch.convention.api
6-
import com.example.metasearch.convention.implementationProject
7-
import com.example.metasearch.convention.libs
8-
import com.example.metasearch.convention.ksp
4+
import com.metasearch.android.convention.implementation
5+
import com.metasearch.android.convention.api
6+
import com.metasearch.android.convention.implementationProject
7+
import com.metasearch.android.convention.libs
8+
import com.metasearch.android.convention.ksp
99

1010
internal class AndroidFeatureConventionPlugin : Plugin<Project> {
1111
override fun apply(target: Project) {

‎build-logic/src/main/java/AndroidHiltConventionPlugin.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import com.example.metasearch.convention.Plugins
2-
import com.example.metasearch.convention.implementation
3-
import com.example.metasearch.convention.libs
4-
import com.example.metasearch.convention.ksp
1+
import com.metasearch.android.convention.Plugins
2+
import com.metasearch.android.convention.implementation
3+
import com.metasearch.android.convention.libs
4+
import com.metasearch.android.convention.ksp
55
import org.gradle.api.Plugin
66
import org.gradle.api.Project
77
import org.gradle.kotlin.dsl.dependencies

‎build-logic/src/main/java/AndroidLibraryComposeConventionPlugin.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import com.android.build.api.dsl.LibraryExtension
2-
import com.example.metasearch.convention.Plugins
3-
import com.example.metasearch.convention.configureCompose
2+
import com.metasearch.android.convention.Plugins
3+
import com.metasearch.android.convention.configureCompose
44
import org.gradle.api.Plugin
55
import org.gradle.api.Project
66
import org.gradle.kotlin.dsl.configure

0 commit comments

Comments
 (0)