Skip to content

Commit

Permalink
Merge pull request #10 from yoesuv/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
yoesuv authored Apr 13, 2024
2 parents f933d0d + 3dbc370 commit e76d476
Show file tree
Hide file tree
Showing 66 changed files with 420 additions and 429 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/github-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ on:
push:
branches:
- master
- develop
pull_request:
branches:
- master
jobs:
Explore-GitHub-Actions:
runs-on: ubuntu-latest
Expand All @@ -19,10 +21,10 @@ jobs:
- name: List files in the repository decrypt
run: ls ${{ github.workspace }}
- name: Setup Java JDK
uses: actions/setup-java@v3.10.0
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '11'
java-version: '17'
- name : Verify Java Version
run: java --version
- name: Setup Android SDK Tools
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@
/captures
.externalNativeBuild
.cxx
local.properties

apiKey.properties
3 changes: 3 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/deploymentTargetDropDown.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/migrations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,9 @@ DIRECTION_API_KEY = your_map_direction_api_key
* [Glide](https://github.com/bumptech/glide)
* [Icons8 Icon](https://icons8.com/)
* [OkHttp Logging](https://github.com/square/okhttp/tree/master/okhttp-logging-interceptor)
* [PhotoView](https://github.com/chrisbanes/PhotoView)
* [Retrofit](https://github.com/square/retrofit)
* [SDP](https://github.com/intuit/sdp)
* [SSP](https://github.com/intuit/ssp)
* [Toasty](https://github.com/GrenderG/Toasty)


## License ##
Expand Down
112 changes: 0 additions & 112 deletions app/build.gradle

This file was deleted.

143 changes: 143 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
import java.util.Properties

val apiKeyPropertiesFile = project.rootProject.file("apiKey.properties")
val apiKeyProperties = Properties()
apiKeyProperties.load(apiKeyPropertiesFile.inputStream())

plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
id("kotlin-kapt")
id("kotlin-parcelize")
id("com.google.gms.google-services")
id("com.google.firebase.firebase-perf")
id("com.google.firebase.crashlytics")
id("androidx.navigation.safeargs")
id("com.google.devtools.ksp")
id("com.getkeepsafe.dexcount")
}

android {

signingConfigs {
create("config") {
keyAlias = project.properties["KEY_ALIAS"].toString()
keyPassword = project.properties["KEY_PASSWORD"].toString()
storeFile = file("../-yusuf.keystore")
storePassword = project.properties["STORE_PASSWORD"].toString()
}
}

namespace = "com.yoesuv.infomadiun"
compileSdk = project.properties["targetApiLevel"].toString().toInt()

defaultConfig {
val keyMaps = apiKeyProperties["MAPS_API_KEY"].toString()
val keyDirections = apiKeyProperties["DIRECTION_API_KEY"].toString()

applicationId = "com.yoesuv.infomadiun"
minSdk = project.properties["minApiLevel"].toString().toInt()
targetSdk = project.properties["targetApiLevel"].toString().toInt()
versionCode = project.properties["versionCode"].toString().toInt()
versionName = project.properties["versionName"].toString()
vectorDrawables {
useSupportLibrary = true
}
setProperty("archivesBaseName", "$applicationId-v$versionCode($versionName)")
resValue("string", "MAPS_API_KEY", keyMaps)
resValue("string", "DIRECTION_API_KEY", keyDirections)
}

buildTypes {
debug {
isMinifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
signingConfig = signingConfigs.getByName("config")
}
release {
isMinifyEnabled = true
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
signingConfig = signingConfigs.getByName("config")
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = "17"
}

sourceSets {
getByName("main") {
res.srcDirs("src/main/res")
res.srcDirs("src/main/res-menu")
res.srcDirs("src/main/res-menu/gallery")
res.srcDirs("src/main/res-menu/listplace")
res.srcDirs("src/main/res-menu/maps")
res.srcDirs("src/main/res-menu/other")
}
}

buildFeatures {
dataBinding = true
buildConfig = true
}
flavorDimensions.add("default")

packaging {
resources {
excludes += "/META-INF/{AL2.0,LGPL2.1}"
}
}
}

dependencies {
val playServiceMapsVersion: String by project
val playServiceLocationVersion: String by project
val lifeCycleVersion: String by project
val navigationVersion: String by project
val roomVersion: String by project
val viewPager2Version: String by project
val retrofitVersion: String by project
val httpLoggingVersion: String by project
val glideVersion: String by project
val googleDirectionLibraryVersion: String by project
val sspVersion: String by project
val sdpVersion: String by project

implementation("androidx.core:core-ktx:1.12.0")
implementation ("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.11.0")
implementation("androidx.constraintlayout:constraintlayout:2.1.4")

testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
androidTestImplementation("androidx.test.espresso:espresso-contrib:3.5.1")

implementation("com.google.android.gms:play-services-maps:$playServiceMapsVersion")
implementation("com.google.android.gms:play-services-location:$playServiceLocationVersion")
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifeCycleVersion")
implementation("androidx.navigation:navigation-fragment-ktx:$navigationVersion")
implementation("androidx.navigation:navigation-ui-ktx:$navigationVersion")
implementation("androidx.room:room-runtime:$roomVersion")
ksp("androidx.room:room-compiler:$roomVersion")
implementation("androidx.room:room-ktx:$roomVersion")
implementation("androidx.viewpager2:viewpager2:$viewPager2Version")

implementation(platform("com.google.firebase:firebase-bom:32.8.1"))
implementation("com.google.firebase:firebase-perf")
implementation("com.google.firebase:firebase-crashlytics")
implementation("com.google.firebase:firebase-analytics")

implementation("com.squareup.retrofit2:retrofit:$retrofitVersion")
implementation("com.squareup.retrofit2:converter-gson:$retrofitVersion")
implementation("com.squareup.okhttp3:logging-interceptor:$httpLoggingVersion")

implementation("com.github.bumptech.glide:glide:$glideVersion")
ksp("com.github.bumptech.glide:compiler:$glideVersion")
implementation("com.akexorcist:google-direction-library:$googleDirectionLibraryVersion")
implementation("com.intuit.ssp:ssp-android:$sspVersion")
implementation("com.intuit.sdp:sdp-android:$sdpVersion")
}
Loading

0 comments on commit e76d476

Please sign in to comment.