Skip to content

Commit

Permalink
Merge pull request #170 from erdo/next-version
Browse files Browse the repository at this point in the history
Next version
  • Loading branch information
erdo authored Mar 31, 2024
2 parents 5fd21a9 + 4d748a4 commit edd99c9
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 26 deletions.
2 changes: 1 addition & 1 deletion app-examples/example-kt-07apollo3/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import co.early.fore.Shared.BuildTypes

plugins {
id("com.android.application")
id("com.apollographql.apollo3").version("3.8.1")
id("com.apollographql.apollo3").version("3.8.3")
kotlin("android")
kotlin("kapt")
}
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ dependencies {

// we want the kotlin and android gradle plugin, because we want to access them in our plugin
//implementation("com.android.tools.build:gradle:${co.early.fore.Shared.Versions.android_gradle_plugin}")
implementation("com.android.tools.build:gradle:8.1.1")
implementation("com.android.tools.build:gradle:8.3.1")
//implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${co.early.fore.Shared.Versions.kotlin_version}")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22")

//for custom plugins
implementation(gradleApi())
Expand Down
37 changes: 19 additions & 18 deletions buildSrc/src/main/java/co/early/fore/Shared.kt
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,27 @@ object Shared {

object Versions {
// fore core package dependencies
const val android_gradle_plugin = "8.1.1" // must manually change buildSrc.build version
const val kotlin_version = "1.9.0" // must manually change buildSrc.build version
const val kotlinx_coroutines_core = "1.7.1"
const val android_gradle_plugin = "8.3.1" // must manually change buildSrc.build version
const val kotlin_version = "1.9.22" // must manually change buildSrc.build version
const val kotlinx_coroutines_core = "1.8.0"
const val jvm_toolchain = 8
// fore optional package dependencies
const val kotlinx_coroutines_android = "1.7.1"
const val kotlinx_coroutines_android = "1.8.0"
const val androidx_lifecycle_common = "2.6.1"
const val recyclerview = "1.2.1"
const val recyclerview = "1.3.2"
const val okhttp3v3 = "3.14.9"
const val okhttp3v4 = "4.11.0"
const val okhttp3v5 = "5.0.0-alpha.11"
const val okhttp3v4 = "4.12.0"
const val okhttp3v5 = "5.0.0-alpha.12"
const val apollo = "2.5.14"
const val apollo3 = "3.8.1"
const val retrofit = "2.9.0"
const val composeCompiler = "1.5.2" // https://developer.android.com/jetpack/androidx/releases/compose-kotlin
const val composeUi = "1.5.1"
const val androidWindow = "1.1.0"
const val apollo3 = "3.8.3"
const val apollo3v4 = "4.0.0-beta.5"
const val retrofit = "2.11.0"
const val composeCompiler = "1.5.10" // https://developer.android.com/jetpack/androidx/releases/compose-kotlin
const val composeUi = "1.6.4"
const val androidWindow = "1.2.0"
// example app and test dependencies
const val activityCompose = "1.4.0"
const val composeBom = "2023.05.01"
const val activityCompose = "1.8.2"
const val composeBom = "2024.03.00"
const val android_core = "1.8.0"
const val annotation = "1.0.0"
const val material = "1.7.0"
Expand All @@ -55,7 +56,7 @@ object Shared {
const val robolectric = "4.9"
const val gson = "2.8.5"
const val constraintlayout = "2.1.4"
const val ktor_client = "2.3.0"
const val ktor_client = "2.3.9"
const val converter_gson = "2.6.0"
const val kotlinxSerializationJson = "1.5.1"
}
Expand All @@ -67,8 +68,8 @@ object Shared {
}

object Publish {
const val LIB_VERSION_NAME = "1.6.2" //"x.x.x-SNAPSHOT"
const val LIB_VERSION_CODE = 96
const val LIB_VERSION_NAME = "1.6.3" //"x.x.x-SNAPSHOT"
const val LIB_VERSION_CODE = 97
const val LIB_GROUP = "co.early.fore"
const val PROJ_NAME = "fore"
const val LIB_DEVELOPER_ID = "erdo"
Expand All @@ -82,7 +83,7 @@ object Shared {
const val LICENCE_URL = "http://www.apache.org/licenses/LICENSE-2.0.txt"

const val use_published_version = false
const val published_fore_version_for_examples = "1.6.2"
const val published_fore_version_for_examples = "1.6.3"
}

object Secrets {
Expand Down
6 changes: 3 additions & 3 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![license-apache2](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://github.com/erdo/android-fore/blob/master/LICENSE.txt){: .float-left}

![central-1.6.2](https://img.shields.io/badge/central-1.6.2-green.svg){: .float-left}
![central-1.6.3](https://img.shields.io/badge/central-1.6.3-green.svg){: .float-left}

![api-16](https://img.shields.io/badge/api-16%2B-orange.svg){: .float-left}

Expand All @@ -14,7 +14,7 @@
**fore** helps you move code out of the view layer, leaving your reactive view code to deal with the absolute fundamentals: *what things look like*

```
implementation("co.early.fore:fore-kt-android:1.6.2")
implementation("co.early.fore:fore-kt-android:1.6.3")
```

More detailed [version / package information here](https://erdo.github.io/android-fore/06-upgrading.html#shoom).
Expand All @@ -23,7 +23,7 @@ More detailed [version / package information here](https://erdo.github.io/androi

For fore's [observeAsState()](https://dev.to/erdo/tic-tac-toe-from-mvp-to-jetpack-compose-57d8) function, and fore's [WindowSize](https://dev.to/erdo/jetpack-compose-and-windowsize-classes-gb4) classes (from 1.4.0 and above):
```
implementation("co.early.fore:fore-kt-android-compose:1.5.2")
implementation("co.early.fore:fore-kt-android-compose:1.5.10")
```
(The versioning matches the composeCompiler version, but the versions are interchangeable)

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ org.gradle.jvmargs=-Xmx1920M \

android.nonFinalResIds=false
android.enableBuildConfigAsBytecode = true
android.defaults.buildfeatures.buildconfig=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-8.0-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip

0 comments on commit edd99c9

Please sign in to comment.