Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ static def releaseTime() {

android {
compileSdk 34

defaultConfig {
applicationId "com.luck.pictureselector"
minSdk 21
targetSdk 34
minSdkVersion 21
targetSdkVersion 34
versionCode cfgs.versionCode
versionName cfgs.versionName
}
Expand Down Expand Up @@ -69,9 +68,11 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

namespace "com.luck.pictureselector"
}

dependencies {
Expand Down
14 changes: 12 additions & 2 deletions app/src/main/res/layout/ps_custom_fragment_selector.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
app:layout_constraintBottom_toTopOf="@+id/bottom_nar_bar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/title_bar" />
app:layout_constraintTop_toBottomOf="@+id/media_reselection_tip_view" />

<TextView
android:id="@+id/tv_current_data_time"
Expand All @@ -31,7 +31,7 @@
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/title_bar" />
app:layout_constraintTop_toBottomOf="@+id/media_reselection_tip_view" />

<com.luck.pictureselector.CustomTitleBar
android:id="@+id/title_bar"
Expand All @@ -42,6 +42,16 @@
app:layout_constraintTop_toTopOf="parent"
tools:layout_height="48dp" />

<com.luck.picture.lib.widget.MediaReselectionTipView
android:id="@+id/media_reselection_tip_view"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/title_bar"
tools:layout_height="48dp" />

<com.luck.pictureselector.CustomBottomNavBar
android:id="@+id/bottom_nar_bar"
android:layout_width="0dp"
Expand Down
36 changes: 24 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,22 @@ apply from: "config.gradle"

buildscript {
repositories {
google()
mavenCentral()
maven {
url 'https://maven.google.com/'
name 'Google'
google {
content {
includeGroupByRegex("com\\.android.*")
includeGroupByRegex("com\\.google.*")
includeGroupByRegex("androidx.*")
}
}
mavenCentral()
gradlePluginPortal()
maven { url 'https://developer.huawei.com/repo/' } //华为 push
//mavenCentral仓和jcenter仓的聚合仓 阿里云镜像(老)
maven { url 'https://maven.aliyun.com/nexus/content/groups/public' }
}
dependencies {
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21'
classpath 'com.android.tools.build:gradle:8.10.1'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand All @@ -21,12 +27,18 @@ buildscript {
allprojects {

repositories {
google()
mavenCentral()
maven {
url 'https://maven.google.com/'
name 'Google'
google {
content {
includeGroupByRegex("com\\.android.*")
includeGroupByRegex("com\\.google.*")
includeGroupByRegex("androidx.*")
}
}
mavenCentral()
gradlePluginPortal()
maven { url 'https://developer.huawei.com/repo/' } //华为 push
//mavenCentral仓和jcenter仓的聚合仓 阿里云镜像(老)
maven { url 'https://maven.aliyun.com/nexus/content/groups/public' }
}
}

Expand Down
11 changes: 6 additions & 5 deletions camerax/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ plugins {
}

android {
compileSdkVersion 31

compileSdk 34
defaultConfig {
minSdkVersion 21
targetSdkVersion 31
targetSdkVersion 34

consumerProguardFiles "consumer-rules.pro"
}
Expand All @@ -19,9 +18,11 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

namespace "com.luck.lib.camerax"
}

ext {
Expand Down
22 changes: 17 additions & 5 deletions compress/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,38 @@ apply plugin: 'com.android.library'

buildscript {
repositories {
jcenter()
google {
content {
includeGroupByRegex("com\\.android.*")
includeGroupByRegex("com\\.google.*")
includeGroupByRegex("androidx.*")
}
}
mavenCentral()
gradlePluginPortal()
maven { url 'https://developer.huawei.com/repo/' } //华为 push
//mavenCentral仓和jcenter仓的聚合仓 阿里云镜像(老)
maven { url 'https://maven.aliyun.com/nexus/content/groups/public' }
}
dependencies {
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
}
}

android {
compileSdkVersion 27

compileSdk 34
defaultConfig {
minSdkVersion 14
targetSdkVersion 27
minSdkVersion 21
targetSdkVersion 34
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

namespace "top.zibin.luban"
}

ext {
Expand Down
31 changes: 23 additions & 8 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,19 +1,34 @@
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
## For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
#
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m
# Default value: -Xmx1024m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
#
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true

android.useAndroidX=true
#Tue Nov 22 14:42:20 CST 2022
kotlin.code.style=official
android.injected.testOnly=false
org.gradle.jvmargs=-Xms6g -Xmx6g -Dkotlin.daemon.jvm.options\="-Xmx6g" -XX\:MaxMetaspaceSize=1g -XX\:+HeapDumpOnOutOfMemoryError -Dfile.encoding\=UTF-8 -XX\:+UseParallelGC
android.useAndroidX=true
android.enableJetifier=true
#
#--------- gradle 8.0 new properties -----------------
#?????????????? module ?? BuildConfig ?????? false????????????????????? build.gradle ?????
android.defaults.buildfeatures.buildconfig=true
#????????R????????????? lib ?? R ???????????????? true?
android.nonTransitiveRClass=false
#??????? Java ????????????? true???? switch-case ????? id ??????? final ???
android.nonFinalResIds=false
#????????? false?? true ??BuildConfig ??????? Java ????????????????? Java ?????
#android.enableBuildConfigAsBytecode=false
# default true
android.enableR8.fullMode=false
# ksp ?? 2.0.0 ??????????? ksp2?epoxy-processor 5.1.4 ???????20250623?
ksp.useKSP2=false


2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-8.11.1-bin.zip
17 changes: 9 additions & 8 deletions ijkplayer-java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,25 @@ apply plugin: 'com.android.library'

android {
// http://tools.android.com/tech-docs/new-build-system/tips
//noinspection GroovyAssignabilityCheck
compileSdkVersion 30
//noinspection GroovyAssignabilityCheck
buildToolsVersion "30.0.3"

compileSdk 34
defaultConfig {
minSdkVersion 21
targetSdkVersion 34
}

lintOptions {
abortOnError false
}
defaultConfig {
minSdkVersion 9
targetSdkVersion 30
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

namespace 'tv.danmaku.ijk.media.player'
}

dependencies {
Expand Down
11 changes: 6 additions & 5 deletions selector/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@ apply plugin: 'com.android.library'

android {
compileSdk 34

defaultConfig {
minSdk 19
targetSdk 34
minSdkVersion 21
targetSdkVersion 34

vectorDrawables.useSupportLibrary = true
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

buildTypes {
Expand All @@ -24,6 +23,8 @@ android {
lintOptions {
abortOnError false
}

namespace "com.luck.picture.lib"
}

ext {
Expand Down
Loading