Skip to content

Commit 4e01e89

Browse files
Lenkomotivebakicelebi
Lenkomotive
and
bakicelebi
authored
PAINTROID-785: Upgrade Project (Catrobat#110)
* PAINTROID-785: Upgrade Project - upgrade Xcode to 16.2 - upgrade flutter to 3.27.4 * PAINTROID-785: Upgrade Project - upgrade flutter version in workflow * PAINTROID-785: Upgrade Project - fix tests * PAINTROID-785 potential pipeline fix * PAINTROID-785 upgrade kotlin version * PAINTROID-785 fix android build * PAINTROID-785 upgrade gh actions flutter version * PAINTROID-785 fix static analysis errors * PAINTROID-785 update fvmrc flutter version --------- Co-authored-by: Baki Celebi <clozopin@gmail.com>
1 parent 3a48447 commit 4e01e89

File tree

67 files changed

+685
-584
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+685
-584
lines changed

‎.fvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"flutter": "3.22.2"
2+
"flutter": "3.29.2"
33
}

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
- uses: actions/checkout@v4.1.4
1010
- uses: subosito/flutter-action@v2.10.0
1111
with:
12-
flutter-version: "3.22.2"
12+
flutter-version: "3.29.2"
1313
channel: "stable"
1414
cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:"
1515
cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
*.swp
66
.DS_Store
77
.atom/
8+
.build/
89
.buildlog/
910
.history
1011
.svn/
12+
.swiftpm/
1113
migrate_working_dir/
1214

1315
# IntelliJ related

‎android/.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ gradle-wrapper.jar
55
/gradlew.bat
66
/local.properties
77
GeneratedPluginRegistrant.java
8-
8+
.cxx/
99
# Remember to never publicly share your keystore.
1010
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
1111
key.properties

‎android/app/build.gradle‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ if (localPropertiesFile.exists()) {
1313
}
1414

1515
android {
16-
compileSdkVersion 34
16+
namespace = "org.catrobat.paintroid"
17+
compileSdkVersion 35
1718
ndkVersion flutter.ndkVersion
1819

1920
compileOptions {
@@ -31,15 +32,16 @@ android {
3132

3233
defaultConfig {
3334
applicationId "org.catrobat.paintroidflutter"
34-
minSdkVersion 21
35-
targetSdkVersion 34
35+
minSdkVersion 24
36+
targetSdkVersion 35
3637
versionCode 1
3738
versionName "1.0.0"
3839
}
3940

4041
buildTypes {
4142
release {
4243
signingConfig signingConfigs.debug
44+
minifyEnabled true
4345
}
4446
}
4547
}

‎android/app/src/debug/AndroidManifest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="org.catrobat.paintroid">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32

43
<uses-permission android:name="android.permission.INTERNET" />
54
</manifest>

‎android/app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="org.catrobat.paintroid">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32

43
<uses-permission
54
android:name="android.permission.WRITE_EXTERNAL_STORAGE"

‎android/settings.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pluginManagement {
1818

1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21-
id "com.android.application" version "7.4.2" apply false
21+
id "com.android.application" version "8.1.0" apply false
2222
id "org.jetbrains.kotlin.android" version "1.8.21" apply false
2323
}
2424

‎ios/Podfile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,13 @@ post_install do |installer|
4040

4141
# https://pub.dev/packages/permission_handler
4242
target.build_configurations.each do |config|
43+
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
44+
4345
config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
4446
'$(inherited)',
4547
'PERMISSION_PHOTOS=1',
4648
'PERMISSION_PHOTOS_ADD_ONLY=1'
4749
]
48-
end
50+
end
4951
end
50-
end
52+
end

‎ios/Podfile.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ SPEC CHECKSUMS:
118118
device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
119119
DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
120120
DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
121-
file_picker: ce3938a0df3cc1ef404671531facef740d03f920
121+
file_picker: b159e0c068aef54932bb15dc9fd1571818edaf49
122122
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
123123
flutter_localization: f43b18844a2b3d2c71fd64f04ffd6b1e64dd54d4
124124
image_picker_ios: 99dfe1854b4fa34d0364e74a78448a0151025425
@@ -131,8 +131,8 @@ SPEC CHECKSUMS:
131131
shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
132132
sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
133133
SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
134-
url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812
134+
url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
135135

136-
PODFILE CHECKSUM: 303789365c3a8d7bc562e5e65d7e8e15218ec5c6
136+
PODFILE CHECKSUM: aa9c826e174e713c4dad1b0d2110be4d87591fc5
137137

138-
COCOAPODS: 1.15.0
138+
COCOAPODS: 1.16.2

0 commit comments

Comments
 (0)