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
1 change: 0 additions & 1 deletion .github/workflows/CD-Prod-Play-Phone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ jobs:
with:
java-version: '17'
distribution: 'temurin'
cache: gradle

- name: Set up Flutter
uses: subosito/flutter-action@v2
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/CD-Prod-Play-WearOS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ jobs:
with:
java-version: '17'
distribution: 'temurin'
cache: gradle

- name: Set up Flutter
uses: subosito/flutter-action@v2
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ jobs:
with:
java-version: '17'
distribution: 'temurin'
cache: gradle

- name: Set up Flutter
uses: subosito/flutter-action@v2
Expand Down Expand Up @@ -188,7 +187,6 @@ jobs:
with:
java-version: '17'
distribution: 'temurin'
cache: gradle

- name: Set up Flutter
uses: subosito/flutter-action@v2
Expand Down
78 changes: 0 additions & 78 deletions android/app/build.gradle

This file was deleted.

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

plugins {
id("com.android.application")
// START: FlutterFire Configuration
id("com.google.gms.google-services")
// END: FlutterFire Configuration
id("kotlin-android")
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
id("dev.flutter.flutter-gradle-plugin")
}

val keystoreProperties = Properties()
val keystorePropertiesFile = rootProject.file("key.properties")
if (keystorePropertiesFile.exists()) {
keystoreProperties.load(FileInputStream(keystorePropertiesFile))
}

android {
namespace = "com.aadishsamir.shopsync"
compileSdk = flutter.compileSdkVersion
ndkVersion = flutter.ndkVersion

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = "1.8"
}

signingConfigs {
if (keystorePropertiesFile.exists()) {
register("release") {
keyAlias = keystoreProperties["keyAlias"] as String
keyPassword = keystoreProperties["keyPassword"] as String
storeFile = keystoreProperties["storeFile"]?.let { file(it.toString()) }
storePassword = keystoreProperties["storePassword"] as String
}
}
Comment on lines +34 to +42

This comment was marked as outdated.

}
Comment thread
aadishsamir123 marked this conversation as resolved.

defaultConfig {
applicationId = "com.aadishsamir.shopsync"
minSdk = 29
targetSdk = 35

// Enable Credential Manager for Google Sign-In
manifestPlaceholders["credentialManagerEnabled"] = true
}

flavorDimensions.add("platform")
productFlavors {
create("phone") {
val phoneBaseVersionCode = 300000000
val phoneVersionCode = 7
dimension = "platform"
manifestPlaceholders.clear()
versionName = "5.0.2-phone"
versionCode = phoneBaseVersionCode + phoneVersionCode
}
create("wear") {
val wearBaseVersionCode = 400000000
val wearVersionCode = 5
manifestPlaceholders.clear()
dimension = "platform"
versionName = "1.2.3-wear"
versionCode = wearBaseVersionCode + wearVersionCode
}
}
Comment thread
aadishsamir123 marked this conversation as resolved.

buildTypes {
named("release") {
if (keystorePropertiesFile.exists()) {
signingConfig = signingConfigs.getByName("release")
}
}
}
}

flutter {
source = "../.."
}
18 changes: 0 additions & 18 deletions android/build.gradle

This file was deleted.

18 changes: 18 additions & 0 deletions android/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
allprojects {
repositories {
google()
mavenCentral()
}
}

rootProject.layout.buildDirectory.set(file("../build"))
subprojects {
project.layout.buildDirectory.set(file("${rootProject.layout.buildDirectory.get()}/${project.name}"))
}
subprojects {
project.evaluationDependsOn(":app")
}

tasks.register<Delete>("clean") {
delete(rootProject.layout.buildDirectory)
}
28 changes: 0 additions & 28 deletions android/settings.gradle

This file was deleted.

28 changes: 28 additions & 0 deletions android/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
pluginManagement {
val flutterSdkPath: String = run {
val properties = java.util.Properties()
file("local.properties").inputStream().use { properties.load(it) }
val flutterSdkPath = properties.getProperty("flutter.sdk")
requireNotNull(flutterSdkPath) { "flutter.sdk not set in local.properties" }
flutterSdkPath
}
Comment thread
aadishsamir123 marked this conversation as resolved.

includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")

repositories {
google()
mavenCentral()
gradlePluginPortal()
}
}

plugins {
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
id("com.android.application") version "8.6.0" apply false
// START: FlutterFire Configuration
id("com.google.gms.google-services") version "4.3.15" apply false
// END: FlutterFire Configuration
id("org.jetbrains.kotlin.android") version "2.1.21" apply false
}

include(":app")
1 change: 0 additions & 1 deletion lib/l10n/app_zh_Hans.arb

This file was deleted.

Loading