Skip to content

Commit

Permalink
[3.2.2] New version
Browse files Browse the repository at this point in the history
  • Loading branch information
Carapacik committed Feb 9, 2025
1 parent 971e135 commit 52dcfd1
Show file tree
Hide file tree
Showing 61 changed files with 1,198 additions and 1,884 deletions.
2 changes: 1 addition & 1 deletion .fvmrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"flutter": "3.24.5"
"flutter": "3.27.4"
}
2 changes: 1 addition & 1 deletion .github/workflows/analyze.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
name: "Run analyze"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4.2.2
- uses: actions/checkout@v4
- uses: subosito/flutter-action@v2.18.0
with:
channel: stable
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
name: "Deploy on Github Pages"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4.2.2
- uses: actions/checkout@v4
- uses: subosito/flutter-action@v2.18.0
with:
channel: stable
Expand All @@ -25,7 +25,7 @@ jobs:
- name: Build
run: flutter build web
- name: Deploy
uses: peaceiris/actions-gh-pages@v4.0.0
uses: peaceiris/actions-gh-pages@v4
with:
github_token: "${{ secrets.GITHUB_TOKEN }}"
publish_dir: ./build/web
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
*.swp
.DS_Store
.atom/
.build/
.buildlog/
.history
.svn/
.swiftpm/
migrate_working_dir/

# IntelliJ related
Expand Down Expand Up @@ -43,4 +45,4 @@ app.*.map.json
/android/app/release

# FVM Version Cache
.fvm/
.fvm/
7 changes: 3 additions & 4 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
include: package:carapacik_lints/core.yaml

linter:
rules:
sort_pub_dependencies: false
analyzer:
exclude:
- '**/localization/generated/**'
- '**/generated/**'
formatter:
page_width: 120
53 changes: 0 additions & 53 deletions android/app/build.gradle

This file was deleted.

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

val keystorePropertiesFile = rootProject.file("key.properties")
val keystoreProperties = Properties()
keystoreProperties.load(FileInputStream(keystorePropertiesFile))

plugins {
id("com.android.application")
id("kotlin-android")
id("dev.flutter.flutter-gradle-plugin")
}

android {
namespace = "com.carapacik.wordly"
compileSdk = 35
ndkVersion = "27.2.12479018"

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

kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
}

defaultConfig {
applicationId = "com.carapacik.wordly"
minSdk = 24
targetSdk = 35
versionCode = flutter.versionCode
versionName = flutter.versionName
}

signingConfigs {
create("release") {
keyAlias = keystoreProperties["keyAlias"] as String
keyPassword = keystoreProperties["keyPassword"] as String
storeFile = file(keystoreProperties["storeFile"] as String)
storePassword = keystoreProperties["storePassword"] as String
}
}

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

flutter {
source = "../.."
}
2 changes: 0 additions & 2 deletions android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ rootProject.layout.buildDirectory.value(newBuildDir)
subprojects {
val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
project.layout.buildDirectory.value(newSubprojectBuildDir)
}
subprojects {
project.evaluationDependsOn(":app")
}

Expand Down
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
4 changes: 2 additions & 2 deletions android/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ pluginManagement {

plugins {
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
id("com.android.application") version "8.7.2" apply false
id("org.jetbrains.kotlin.android") version "2.0.21" apply false
id("com.android.application") version "8.8.0" apply false
id("org.jetbrains.kotlin.android") version "2.1.10" apply false
}

include(":app")
1 change: 0 additions & 1 deletion ios/Flutter/Debug.xcconfig
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
#include "Generated.xcconfig"
1 change: 0 additions & 1 deletion ios/Flutter/Release.xcconfig
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
#include "Generated.xcconfig"
44 changes: 0 additions & 44 deletions ios/Podfile

This file was deleted.

48 changes: 0 additions & 48 deletions ios/Podfile.lock

This file was deleted.

Loading

0 comments on commit 52dcfd1

Please sign in to comment.