Skip to content

Commit 815cede

Browse files
lamarioslamarios
authored
Merge pull request #666 from lamarios/feature/libraries-update-2025-01-30
Feature/libraries update 2025 01 30
2 parents 91f6b1e + 4c1f77d commit 815cede

File tree

16 files changed

+266
-298
lines changed

16 files changed

+266
-298
lines changed

‎.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626
# FLUTTER_VERSION: "2.5.3"
2727
steps:
2828
- uses: actions/checkout@v3
29-
- name: Set up JDK 17
29+
- name: Set up JDK
3030
uses: actions/setup-java@v3
3131
with:
32-
java-version: '17'
32+
java-version: '21'
3333
distribution: 'adopt'
3434
- uses: cachix/install-nix-action@v22
3535
with:
@@ -53,7 +53,7 @@ jobs:
5353
- run: ./submodules/flutter/bin/flutter pub run flutter_native_splash:create
5454
- run: ./submodules/flutter/bin/flutter build apk --profile --split-per-abi
5555
- name: Archive build artifacts
56-
uses: actions/upload-artifact@v3
56+
uses: actions/upload-artifact@v4
5757
with:
5858
name: apks
5959
path: build/app/outputs/flutter-apk

‎.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
# FLUTTER_VERSION: "2.5.3"
2525
steps:
2626
- uses: actions/checkout@v3
27-
- name: Set up JDK 17
27+
- name: Set up JDK
2828
uses: actions/setup-java@v3
2929
with:
30-
java-version: '17'
30+
java-version: '21'
3131
distribution: 'adopt'
3232
- uses: cachix/install-nix-action@v22
3333
with:

‎android/app/build.gradle

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,15 @@ android {
6363
includeInBundle = false
6464
}
6565

66+
compileOptions {
67+
sourceCompatibility 21
68+
targetCompatibility 21
69+
}
70+
71+
kotlinOptions {
72+
jvmTarget = "21"
73+
}
74+
6675
lintOptions {
6776
checkReleaseBuilds false
6877
}
@@ -92,6 +101,7 @@ android {
92101
signingConfig signingConfigs.release
93102
}
94103
}
104+
namespace 'com.github.lamarios.clipious'
95105
}
96106

97107
flutter {

‎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="com.github.lamarios.clipious">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<!-- The INTERNET permission is required for development. Specifically,
43
the Flutter tool needs it to communicate with the running application
54
to allow setting breakpoints, to provide hot reload, etc.

‎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="com.github.lamarios.clipious">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32

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

‎android/app/src/profile/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="com.github.lamarios.clipious">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<!-- The INTERNET permission is required for development. Specifically,
43
the Flutter tool needs it to communicate with the running application
54
to allow setting breakpoints, to provide hot reload, etc.

‎android/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
// kotlin 1.7.10
1+
ext {
2+
sourceCompatibility = 21
3+
}// kotlin 1.7.10
24
// graddle 7.2.2
35

46
allprojects {

‎android/gradle.properties

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
org.gradle.jvmargs=-Xmx1536M
22
android.useAndroidX=true
33
android.enableJetifier=true
4+
android.defaults.buildfeatures.buildconfig=true
5+
android.nonTransitiveRClass=false
6+
android.nonFinalResIds=false
7+
android.kotlinOptions.jvmTarget=21

‎android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#Thu Jan 30 10:10:30 GMT 2025
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
35
zipStoreBase=GRADLE_USER_HOME
46
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

‎android/settings.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ pluginManagement {
1818

1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21-
id "com.android.application" version "7.3.0" apply false
22-
id "org.jetbrains.kotlin.android" version "1.9.0" apply false
21+
id "com.android.application" version '8.4.2' apply false
22+
id "org.jetbrains.kotlin.android" version "1.9.22" apply false
2323
}
2424

2525
include ":app"

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy