Skip to content

Commit

Permalink
Release 4.2.0 (#183)
Browse files Browse the repository at this point in the history
* format

* update copyright

* remove -android.namespacedRClass

* update compile&target sdk version to 30

* update dependencies

* update gitignore

* update samples dependencies

* update signinconfig

* bump up to 4.2.0

* bump up to 4.2.0
  • Loading branch information
wasabeef committed Sep 14, 2020
1 parent fa04c1b commit 074b6ee
Show file tree
Hide file tree
Showing 45 changed files with 294 additions and 311 deletions.
7 changes: 7 additions & 0 deletions .editorconfig
@@ -0,0 +1,7 @@
[*]
indent_size = 2
max_line_length = off
insert_final_newline = true

[*.{kt, kts}]
kotlin_imports_layout = ascii
3 changes: 3 additions & 0 deletions .gitignore
Expand Up @@ -48,6 +48,9 @@ captures/
.idea/modules.xml
.idea/navEditor.xml
.idea/markdown*
.idea/jarRepositories.xml
.idea/inspectionProfiles/Project_Default.xml
.idea/compiler.xml
projectFilesBackup/

# Keystore files
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
@@ -1,6 +1,17 @@
Change Log
==========

Version 4.2.0 *(2020-09-15)*
----------------------------

Update:
- Compile & Target SDK Version 28 -> 30
- GPUImage 2.0.3 -> 2.0.4
- Glide 4.9.0 -> 4.11.0

Bugfix:
- RoundedCornersTransformation with DIAGONAL_FROM_TOP_LEFT does not work [#178](https://github.com/wasabeef/glide-transformations/pull/178)

Version 4.1.0 *(2019-08-15)*
----------------------------

Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -149,7 +149,7 @@ Thanks
License
-------

Copyright 2018 Wasabeef
Copyright (C) 2020 Wasabeef

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
38 changes: 19 additions & 19 deletions build.gradle
@@ -1,27 +1,27 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext {
kotlin_version = '1.3.41'
glide_version = '4.9.0'
gpuimage_version = '2.0.3'
}
ext {
kotlin_version = '1.3.72'
glide_version = '4.11.0'
gpuimage_version = '2.0.4'
}

repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.6.0-alpha05'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.0-alpha10'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}

allprojects {
repositories {
google()
jcenter()
}
repositories {
google()
jcenter()
}
}
38 changes: 7 additions & 31 deletions example/build.gradle
Expand Up @@ -8,61 +8,37 @@ android {
defaultConfig {
minSdkVersion MIN_SDK_VERSION as int
targetSdkVersion TARGET_SDK_VERSION as int
versionCode "git rev-list origin/master --count".execute().text.toInteger()
versionCode VERSION_CODE as int
versionName VERSION_NAME

renderscriptTargetApi TARGET_SDK_VERSION as int
renderscriptSupportModeEnabled true
}

signingConfigs {
release {
storeFile file(keyStoreProperty)
keyAlias keyAliasProperty
storePassword keyStorePasswordProperty
keyPassword keyAliasPasswordProperty
}
}
// SigningConfigs
apply from: '../signingConfigs/debug.gradle', to: android

buildTypes {
debug {
debuggable true
zipAlignEnabled true
signingConfig signingConfigs.debug
}
release {
debuggable false
zipAlignEnabled true
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
shrinkResources true
signingConfig signingConfigs.release
}
}
}

def getKeyStoreProperty() {
return hasProperty('WASABEEF_KEYSTORE') ? WASABEEF_KEYSTORE : "debug.keystore"
}

def getKeyAliasProperty() {
return hasProperty('WASABEEF_KEYALIAS') ? WASABEEF_KEYALIAS : "android"
}

def getKeyStorePasswordProperty() {
return hasProperty('WASABEEF_KEYSTOREPASSWORD') ? WASABEEF_KEYSTOREPASSWORD : "androiddebugkey"
}

def getKeyAliasPasswordProperty() {
return hasProperty('WASABEEF_KEYALIASPASSWORD') ? WASABEEF_KEYALIASPASSWORD : "android"
}

dependencies {
implementation project(':transformations')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "com.github.bumptech.glide:glide:$glide_version"
kapt "com.github.bumptech.glide:compiler:$glide_version"
implementation "jp.co.cyberagent.android:gpuimage:$gpuimage_version"
implementation "androidx.appcompat:appcompat:1.1.0-rc01"
implementation "androidx.recyclerview:recyclerview:1.1.0-beta02"
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation "androidx.appcompat:appcompat:1.3.0-alpha02"
implementation "androidx.recyclerview:recyclerview:1.2.0-alpha05"
implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
}
14 changes: 6 additions & 8 deletions example/src/main/AndroidManifest.xml
@@ -1,23 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="jp.wasabeef.example.glide"
>
xmlns:tools="http://schemas.android.com/tools"
package="jp.wasabeef.example.glide">

<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme"
tools:ignore="GoogleAppIndexingWarning">
tools:ignore="GoogleAppIndexingWarning">
<activity
android:name=".MainActivity"
android:label="@string/app_name"
>
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER"/>
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
Expand Down
2 changes: 1 addition & 1 deletion example/src/main/java/jp/wasabeef/example/glide/Ext.kt
@@ -1,7 +1,7 @@
package jp.wasabeef.example.glide

/**
* Copyright (C) 2019 Wasabeef
* Copyright (C) 2020 Wasabeef
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Expand Up @@ -15,9 +15,9 @@ class MainActivity : AppCompatActivity() {
findViewById<RecyclerView>(R.id.list).apply {
layoutManager = LinearLayoutManager(context)
adapter = MainAdapter(context, mutableListOf(
Mask, NinePatchMask, RoundedCorners, CropTop, CropCenter, CropBottom, CropSquare, CropCircle,
CropCircleWithBorder, Grayscale, Blur, SupportRSBlur, Toon, Sepia, Contrast, Invert,
Pixel, Sketch, Swirl, Brightness, Kuawahara, Vignette
Mask, NinePatchMask, RoundedCorners, CropTop, CropCenter, CropBottom, CropSquare, CropCircle,
CropCircleWithBorder, Grayscale, Blur, SupportRSBlur, Toon, Sepia, Contrast, Invert,
Pixel, Sketch, Swirl, Brightness, Kuawahara, Vignette
))
}
}
Expand Down

0 comments on commit 074b6ee

Please sign in to comment.