Merge branch 'develop'

ideckia · Sep 11, 2023 · b8fb49d · b8fb49d
2 parents e05b07f + 6bda1ba
commit b8fb49d
Show file tree

Hide file tree

Showing 4 changed files with 103 additions and 111 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -20,7 +20,7 @@ jobs:
     # Setup the flutter environment.
     - uses: subosito/flutter-action@v1
       with:
-        flutter-version: '3.7.6'
+        flutter-version: '3.10.5'
 
     # Get flutter dependencies.
     - run: flutter pub get
@@ -29,7 +29,7 @@ jobs:
     - run: flutter build apk
 
     # Rename the apk
-    - run: mv build/app/outputs/apk/release/app-release.apk ideckia-release.apk
+    - run: mv build/app/outputs/flutter-apk/app-release.apk ideckia-release.apk
 
     - name: Release
       uses: "marvinpinto/action-automatic-releases@latest"

diff --git a/...otlin/com/example/ideckia/MainActivity.kt → ...c/main/kotlin/eus/ideckia/MainActivity.kt b/...otlin/com/example/ideckia/MainActivity.kt → ...c/main/kotlin/eus/ideckia/MainActivity.kt
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,31 +1,31 @@
-buildscript {
-    ext.kotlin_version = '1.5.31'
-    repositories {
-        google()
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        jcenter()
-    }
-}
-
-rootProject.buildDir = '../build'
-subprojects {
-    project.buildDir = "${rootProject.buildDir}/${project.name}"
-}
-subprojects {
-    project.evaluationDependsOn(':app')
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
+buildscript {
+    ext.kotlin_version = '1.6.10'
+    repositories {
+        google()
+        jcenter()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:7.0.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+    }
+}
+
+rootProject.buildDir = '../build'
+subprojects {
+    project.buildDir = "${rootProject.buildDir}/${project.name}"
+}
+subprojects {
+    project.evaluationDependsOn(':app')
+}
+
+tasks.register("clean", Delete) {
+    delete rootProject.buildDir
+}