-
Notifications
You must be signed in to change notification settings - Fork 3
Upgraded ShopSync from Groovy to Kotlin DSL in Gradle and changed some translations #173
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
1b017b6
Upgrade from Groovy to Kotlin DSL in Gradle files
aadishsamir123 2854a96
fix translation files
aadishsamir123 b75fc5f
again fix translation files
aadishsamir123 40ddc7d
replace app_zh_Hans with app_zh because for some reason flutter requi…
aadishsamir123 a553cbb
ensure signing configuration is only applied if keystore properties f…
aadishsamir123 770c0b4
remove redundant cache configuration for gradle in CI and deployment …
aadishsamir123 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
| } | ||
| } | ||
| } | ||
|
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 | ||
| } | ||
| } | ||
|
aadishsamir123 marked this conversation as resolved.
|
||
|
|
||
| buildTypes { | ||
| named("release") { | ||
| if (keystorePropertiesFile.exists()) { | ||
| signingConfig = signingConfigs.getByName("release") | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| flutter { | ||
| source = "../.." | ||
| } | ||
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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) | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
| } | ||
|
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") | ||
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This comment was marked as outdated.
Sorry, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.