kopia lustrzana https://github.com/olgamiller/SSTVEncoder2
Updated gradle (SdkVersion 34),
replaced deprecated 'buildDir', added (now required) 'buildConfig true', forced a specific version of Kotlin (to avoid the build error "Duplicate class kotlin.collections.jdk8.CollectionsJDK8Kt found in modules kotlin-stdlib-1.8.22.jar [..]")pull/18/head
rodzic
88823b2787
commit
18fda14c97
|
@ -1,11 +1,11 @@
|
||||||
apply plugin: 'com.android.application'
|
apply plugin: 'com.android.application'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdk 33
|
compileSdk 34
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "om.sstvencoder"
|
applicationId "om.sstvencoder"
|
||||||
minSdkVersion 21
|
minSdk 21
|
||||||
targetSdkVersion 33
|
targetSdk 34
|
||||||
versionCode 31
|
versionCode 31
|
||||||
versionName "2.10"
|
versionName "2.10"
|
||||||
}
|
}
|
||||||
|
@ -16,10 +16,13 @@ android {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
namespace 'om.sstvencoder'
|
namespace 'om.sstvencoder'
|
||||||
|
buildFeatures {
|
||||||
|
buildConfig true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
implementation 'androidx.appcompat:appcompat:1.6.1'
|
implementation 'androidx.appcompat:appcompat:1.7.0'
|
||||||
implementation "androidx.exifinterface:exifinterface:1.3.6"
|
implementation "androidx.exifinterface:exifinterface:1.3.7"
|
||||||
}
|
}
|
||||||
|
|
11
build.gradle
11
build.gradle
|
@ -4,11 +4,18 @@ buildscript {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:7.4.2'
|
classpath 'com.android.tools.build:gradle:8.5.2'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
allprojects {
|
allprojects {
|
||||||
|
configurations.configureEach {
|
||||||
|
resolutionStrategy.eachDependency { details ->
|
||||||
|
if (details.requested.group == 'org.jetbrains.kotlin') {
|
||||||
|
details.useVersion "1.8.22"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
repositories {
|
repositories {
|
||||||
google()
|
google()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
|
@ -16,5 +23,5 @@ allprojects {
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.register('clean', Delete) {
|
tasks.register('clean', Delete) {
|
||||||
delete rootProject.buildDir
|
delete rootProject.layout.buildDirectory.get().asFile
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|
Ładowanie…
Reference in New Issue