Skip to content

Commit

Permalink
Revert "Update deps"
Browse files Browse the repository at this point in the history
This reverts commit 478bfd4
  • Loading branch information
Dimezis committed Jul 25, 2024
1 parent 1eb18fd commit fb29168
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 24 deletions.
13 changes: 6 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 34
compileSdkVersion 31

defaultConfig {
applicationId "com.eightbitlab.blurview_sample"
minSdkVersion 21
targetSdkVersion 34
minSdkVersion 17
targetSdkVersion 31
versionCode 3
versionName "1.1"
}
Expand All @@ -22,18 +22,17 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
namespace 'com.eightbitlab.blurview_sample'
}

ext {
supportLib = "28.0.0"
}

dependencies {
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'com.google.android.material:material:1.12.0'
implementation 'androidx.recyclerview:recyclerview:1.3.2'
implementation 'com.google.android.material:material:1.5.0'
implementation 'androidx.recyclerview:recyclerview:1.2.1'

implementation project(':library')
}
3 changes: 2 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.eightbitlab.blurview_sample">

<application
android:allowBackup="true"
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.3.2'
classpath 'com.android.tools.build:gradle:7.1.2'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
classpath("de.mannodermaus.gradle.plugins:android-junit5:1.10.0.0")
classpath("de.mannodermaus.gradle.plugins:android-junit5:1.8.2.0")
}
}

Expand Down
2 changes: 0 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,4 @@
# 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.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.useAndroidX=true
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-8.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
19 changes: 9 additions & 10 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
apply plugin: 'de.mannodermaus.android-junit5'

android {
compileSdkVersion 34
compileSdkVersion 31

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand All @@ -11,22 +11,21 @@ android {

defaultConfig {
minSdkVersion 18
targetSdkVersion 34
targetSdkVersion 31
}
namespace 'eightbitlab.com.blurview'
}

configurations {
javadocDeps
}

dependencies {
implementation 'androidx.annotation:annotation:1.8.1'
javadocDeps 'androidx.annotation:annotation:1.8.1'
implementation 'androidx.annotation:annotation:1.3.0'
javadocDeps 'androidx.annotation:annotation:1.3.0'

testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
testImplementation("org.junit.jupiter:junit-jupiter-params:5.10.3")
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
testImplementation("org.junit.jupiter:junit-jupiter-params:5.8.2")
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
}

task androidJavadocs(type: Javadoc) {
Expand All @@ -37,11 +36,11 @@ task androidJavadocs(type: Javadoc) {
}

task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
setArchiveClassifier('javadoc')
classifier = 'javadoc'
from androidJavadocs.destinationDir
}

task androidSourcesJar(type: Jar) {
setArchiveClassifier('sources')
classifier = 'sources'
from android.sourceSets.main.java.srcDirs
}
2 changes: 1 addition & 1 deletion library/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<manifest>
<manifest package="eightbitlab.com.blurview">

<application/>

Expand Down

0 comments on commit fb29168

Please sign in to comment.