wger-project/flutter
1
0
Fork 0
mirror of https://github.com/wger-project/flutter.git synced 2026-02-18 00:17:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update gradle plugin version and other properties

Browse Source 
This was basically done by creating a new flutter project and comparing the
different generated files
This commit is contained in:
Roland Geider
2023-02-07 21:39:14 +01:00
parent c42dc0c825
commit 0e0ae643cb
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
android/app/build.gradle
View File

@@ -44,12 +44,12 @@ if (localMapsPropertiesFile.exists()) {
project.logger.info('Load maps properties from environment') project.logger.info('Load maps properties from environment')
try { try {
wgerProperties['WGER_API_KEY'] = System.getenv('WGER_API_KEY') wgerProperties['WGER_API_KEY'] = System.getenv('WGER_API_KEY')
} catch(NullPointerException e) { } catch (NullPointerException e) {
project.logger.warn('Failed to load WGER_API_KEY from environment.', e) project.logger.warn('Failed to load WGER_API_KEY from environment.', e)
} }
} }
def wgerApiKey = wgerProperties.getProperty('WGER_API_KEY') def wgerApiKey = wgerProperties.getProperty('WGER_API_KEY')
if(wgerApiKey == null){ if (wgerApiKey == null) {
wgerApiKey = "" wgerApiKey = ""
project.logger.error('Wger Api Key not configured. Set it in `/fastlane/metadata/android/envfiles/wger.properties` or in the environment variable `WGER_API_KEY`') project.logger.error('Wger Api Key not configured. Set it in `/fastlane/metadata/android/envfiles/wger.properties` or in the environment variable `WGER_API_KEY`')
} }
@@ -58,6 +58,15 @@ android {
compileSdkVersion 33 compileSdkVersion 33
ndkVersion "25.1.8937393" ndkVersion "25.1.8937393"
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = '1.8'
}
sourceSets { sourceSets {
main.java.srcDirs += 'src/main/kotlin' main.java.srcDirs += 'src/main/kotlin'
} }

8
android/build.gradle
View File

@@ -1,12 +1,12 @@
buildscript { buildscript {
ext.kotlin_version = '1.6.10' ext.kotlin_version = '1.7.10'
repositories { repositories {
google() google()
jcenter() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.3' classpath 'com.android.tools.build:gradle:7.2.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
} }
@@ -14,7 +14,7 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
google() google()
jcenter() mavenCentral()
} }
} }

2
android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip