Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Gradle, Kotlin and CMake #83

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from
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
26 changes: 13 additions & 13 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ android {
}
def versionPropsFile = file('version.properties')
def versionBuild
compileSdkVersion 31
compileSdkVersion 32
buildToolsVersion '30.0.3'

buildFeatures {
Expand Down Expand Up @@ -45,7 +45,7 @@ android {
minSdkVersion 24
//Waiting for api 32 sources
//noinspection OldTargetApi
targetSdkVersion 31
targetSdkVersion 32
versionCode versionBuild
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
ndk {
Expand Down Expand Up @@ -99,33 +99,33 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(path: ':circularbarlib')
implementation 'de.hdodenhof:circleimageview:3.1.0'
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.preference:preference-ktx:1.2.0'
implementation 'org.jetbrains:annotations:16.0.1'
implementation 'org.jetbrains:annotations:23.0.0'
implementation 'androidx.exifinterface:exifinterface:1.3.3'
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'com.github.mohammadatif:Animatoo:master'
implementation 'com.github.ChickenHook:RestrictionBypass:2.2'
implementation 'com.github.bumptech.glide:glide:4.11.0'
implementation 'com.github.bumptech.glide:glide:4.13.2'
implementation project(path: ':photonbypass')
implementation 'org.tensorflow:tensorflow-lite-support:0.1.0'
implementation 'org.tensorflow:tensorflow-lite-metadata:0.1.0'
implementation 'org.tensorflow:tensorflow-lite-gpu:2.3.0'
annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
implementation 'org.tensorflow:tensorflow-lite-support:0.4.1'
implementation 'org.tensorflow:tensorflow-lite-metadata:0.4.1'
implementation 'org.tensorflow:tensorflow-lite-gpu:2.9.0'
annotationProcessor 'com.github.bumptech.glide:compiler:4.13.2'
implementation group: 'commons-io', name: 'commons-io', version: '20030203.000550'
implementation 'rapid.decoder:library:0.3.0'
implementation 'rapid.decoder:jpeg-decoder:0.3.0'
implementation 'rapid.decoder:png-decoder:0.3.0'
implementation 'com.google.code.gson:gson:2.8.9'
implementation 'com.google.code.gson:gson:2.9.0'
// Navigation Component
implementation "androidx.navigation:navigation-fragment-ktx:2.4.2"
implementation "androidx.navigation:navigation-ui-ktx:2.4.2"
//Subsampling image view
implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
//Google Material
implementation 'com.google.android.material:material:1.7.0-alpha01'
implementation "androidx.core:core-ktx:1.7.0"
implementation 'com.google.android.material:material:1.6.1'
implementation "androidx.core:core-ktx:1.8.0"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
//Leak Canary
//Use this lib to detect memory leaks when debugging
Expand Down
4 changes: 2 additions & 2 deletions app/version.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#Wed Jun 08 12:19:54 MSK 2022
VERSION_BUILD=15288
#Mon Jun 20 14:35:44 IST 2022
VERSION_BUILD=15289
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.6.21'
ext.kotlin_version = '1.7.0'

repositories {
maven {
Expand All @@ -15,7 +15,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.1.3'
classpath 'com.android.tools.build:gradle:7.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.quinn.hunter:hunter-debug-plugin:1.2.0'
classpath 'com.quinn.hunter:hunter-transform:1.2.0'
Expand Down
6 changes: 3 additions & 3 deletions circularbarlib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ plugins {
apply plugin: 'kotlin-android'

android {
compileSdkVersion 31
compileSdkVersion 32
buildToolsVersion "30.0.3"

defaultConfig {
minSdkVersion 24
//Waiting for api 32 sources
//noinspection OldTargetApi
targetSdkVersion 31
targetSdkVersion 32

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
Expand All @@ -30,7 +30,7 @@ android {
}

dependencies {
implementation "androidx.core:core-ktx:+"
implementation "androidx.core:core-ktx:1.8.0"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

/* testImplementation 'junit:junit:4.+'
Expand Down
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.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
10 changes: 5 additions & 5 deletions photonbypass/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ android {
externalNativeBuild {
cmake {
path "src/main/cpp/CMakeLists.txt"
version "3.10.2"
version "3.18.1"
}
}
compileOptions {
Expand All @@ -44,11 +44,11 @@ android {

dependencies {

implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'com.google.android.material:material:1.5.0'
implementation "androidx.core:core-ktx:+"
implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'com.google.android.material:material:1.6.1'
implementation "androidx.core:core-ktx:1.8.0"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'io.hexhacking:xdl:1.1.3'
implementation 'io.hexhacking:xdl:1.1.4'
/* testImplementation 'junit:junit:4.+'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'*/
Expand Down
2 changes: 1 addition & 1 deletion photonbypass/src/main/cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# Sets the minimum version of CMake required to build the native library.

cmake_minimum_required(VERSION 3.10.2)
cmake_minimum_required(VERSION 3.18.1)

# Declares and names the project.

Expand Down