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

Update gradle #33

Draft
wants to merge 15 commits into
base: develop
Choose a base branch
from
Draft
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
4 changes: 2 additions & 2 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/git_toolbox_blame.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/migrations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 12 additions & 6 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ try {
}

android {
namespace = "com.q42.q42stats.sample"
signingConfigs {
adhoc {
storeFile file('../adhoc.jks')
Expand All @@ -28,12 +29,12 @@ android {
}
// since this is just a demo app, we don't need a release config for the Play Store
}
compileSdk compile_sdk_version

defaultConfig {
applicationId "com.q42.q42stats.sample"
minSdkVersion min_sdk_version
targetSdkVersion compile_sdk_version
compileSdk compile_sdk_version
minSdk min_sdk_version
targetSdk compile_sdk_version
versionCode 1
versionName "1.0"

Expand All @@ -46,7 +47,7 @@ android {
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

flavorDimensions "distribution"
flavorDimensions = ["distribution"]

productFlavors {
local {
Expand All @@ -59,6 +60,10 @@ android {
}
}

buildFeatures {
buildConfig true
}

buildTypes {
debug {
applicationIdSuffix ".debug"
Expand All @@ -74,8 +79,9 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
// keep in sync with jitpack.yml
sourceCompatibility JavaVersion.VERSION_21
targetCompatibility JavaVersion.VERSION_21
}
kotlinOptions {
jvmTarget = jvm_target
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext {
kotlin_version = "1.6.10"
kotlin_version = "2.0.21"
version_kotlinx_coroutines = "1.6.3"
gradle_version = '7.1.2'
jvm_target = "11"
gradle_version = '8.7.2'
jvm_target = "21"
version_androidx_annotation = "1.2.0"
version_androidx_lifecycle = "2.4.0"

compile_sdk_version = 33
compile_sdk_version = 34
min_sdk_version = 16
}
repositories {
Expand Down
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
kotlin.code.style=official
org.gradle.configuration-cache=true
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Jun 04 14:19:53 CEST 2021
#Tue Dec 24 10:24:21 CET 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
7 changes: 7 additions & 0 deletions jitpack.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# NOTE: it seems this file is not picked up by jitpack.iio, the echo does not show up in the build log
jdk:
- openjdk17
before_install:
- echo "ROOT Hello jitpack.yml before_install ROOT"
- sdk install java 17.0.1-open
- sdk use java 17.0.1-open
15 changes: 10 additions & 5 deletions q42stats/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,23 @@ plugins {
group = 'com.github.Q42'

android {
compileSdkVersion compile_sdk_version
namespace = "com.q42.q42stats.library"

defaultConfig {
minSdkVersion min_sdk_version
targetSdkVersion compile_sdk_version
compileSdk compile_sdk_version
minSdk min_sdk_version
targetSdk compile_sdk_version

buildConfigField("String", "LIB_BUILD_DATE", '"' + new SimpleDateFormat("yyyy-MM-dd").format(Calendar.getInstance().getTime()) + '"')

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
}

buildFeatures {
buildConfig true
}

buildTypes {
release {
minifyEnabled false
Expand All @@ -30,8 +35,8 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
sourceCompatibility JavaVersion.VERSION_21
targetCompatibility JavaVersion.VERSION_21
}
kotlinOptions {
jvmTarget = jvm_target
Expand Down
7 changes: 7 additions & 0 deletions q42stats/jitpack.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# NOTE: it seems this file is not picked up by jitpack.iio, the echo does not show up in the build log
jdk:
- openjdk17
before_install:
- echo "q42stats subfolder Hello jitpack.yml before_install q42stats subfolder"
- sdk install java 17.0.1-open
- sdk use java 17.0.1-open
2 changes: 1 addition & 1 deletion q42stats/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="com.q42.q42stats.library"
<manifest
xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.INTERNET" />
Expand Down