Skip to content

Commit

Permalink
Bump dependencies
Browse files Browse the repository at this point in the history
Migrate to github packages
  • Loading branch information
tompee26 committed Feb 25, 2021
1 parent 0554b97 commit 5658530
Show file tree
Hide file tree
Showing 10 changed files with 157 additions and 52 deletions.
16 changes: 16 additions & 0 deletions .idea/codeStyles/Project.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/compiler.xml

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

25 changes: 25 additions & 0 deletions .idea/jarRepositories.xml

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

2 changes: 1 addition & 1 deletion .idea/misc.xml

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

1 change: 1 addition & 0 deletions .idea/runConfigurations.xml

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

60 changes: 45 additions & 15 deletions annotation/build.gradle
Original file line number Diff line number Diff line change
@@ -1,25 +1,55 @@
apply plugin: 'java-library'
apply plugin: 'kotlin'
apply plugin: 'com.novoda.bintray-release'
apply plugin: 'maven-publish'

sourceCompatibility = JavaVersion.VERSION_1_7
targetCompatibility = JavaVersion.VERSION_1_7
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8

publish {
def groupProjectID = 'com.tompee.bunch'
def artifactProjectID = 'annotations'
def publishVersionID = project.publishVersion
Properties properties = new Properties()
properties.load(project.rootProject.file('local.properties').newDataInputStream())

userOrg = 'tompee26'
repoName = 'Bunch'
groupId = groupProjectID
artifactId = artifactProjectID
publishVersion = publishVersionID
desc = 'Annotation package for Bunch'
website = 'https://github.com/tompee26/Bunch'
publishing {
publications {
mavenJava(MavenPublication) {
groupId = project.groupProjectID
artifactId = 'annotations'
version = project.publishVersion
from components.java

pom {
name = project.projectName
description = 'Annotation package for Bunch'
url = 'https://github.com/tompee26/Bunch'
licenses {
license {
name = 'MIT License'
url = 'https://github.com/tompee26/Bunch/blob/master/LICENSE.md'
}
}
developers {
developer {
id = 'tompee26'
name = 'tompee'
email = 'tompee26@gmail.com'
}
}
}
}
}
repositories {
maven {
name = "GithubPackages"
url = uri("https://maven.pkg.github.com/tompee26/Bunch")
credentials {
username = "tompee26"
password = properties.getProperty("token")
}
}
}
}


dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
}
22 changes: 11 additions & 11 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'
apply plugin: 'kotlin-parcelize'

android {
compileSdkVersion 29
buildToolsVersion "29.0.2"
compileSdkVersion 30
defaultConfig {
applicationId "com.tompee.bunch"
minSdkVersion 21
targetSdkVersion 29
targetSdkVersion 30
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -20,18 +19,19 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation project(path: ':annotation')
kapt project(path: ':compiler')

implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'androidx.core:core-ktx:1.0.2'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.core:core-ktx:1.3.2'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
}
2 changes: 1 addition & 1 deletion app/src/main/java/com/tompee/bunch/TestClass.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package com.tompee.bunch
import android.os.Bundle
import android.os.Parcelable
import com.tompee.bunch.annotation.Bunch
import kotlinx.android.parcel.Parcelize
import kotlinx.parcelize.Parcelize
import java.io.Serializable

open class ParentParcelable(val value: Int)
Expand Down
9 changes: 5 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.3.71'
ext.kotlin_version = '1.4.30'
repositories {
google()
jcenter()

}
dependencies {
classpath 'com.android.tools.build:gradle:3.6.2'
classpath 'com.android.tools.build:gradle:3.6.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.novoda:bintray-release:0.9.1'
}
}

Expand All @@ -21,7 +20,9 @@ allprojects {
}
}

project.ext.set("publishVersion", "0.2.0")
project.ext.set("projectName", "Bunch")
project.ext.set("groupProjectID", "com.tompee.bunch")
project.ext.set("publishVersion", "0.3.0")

task clean(type: Delete) {
delete rootProject.buildDir
Expand Down
66 changes: 46 additions & 20 deletions compiler/build.gradle
Original file line number Diff line number Diff line change
@@ -1,24 +1,10 @@
apply plugin: 'java-library'
apply plugin: 'kotlin'
apply plugin: 'kotlin-kapt'
apply plugin: 'com.novoda.bintray-release'

sourceCompatibility = JavaVersion.VERSION_1_7
targetCompatibility = JavaVersion.VERSION_1_7

publish {
def groupProjectID = 'com.tompee.bunch'
def artifactProjectID = 'compiler'
def publishVersionID = project.publishVersion

userOrg = 'tompee26'
repoName = 'Bunch'
groupId = groupProjectID
artifactId = artifactProjectID
publishVersion = publishVersionID
desc = 'Compiler package for Bunch'
website = 'https://github.com/tompee26/Bunch'
}
apply plugin: 'maven-publish'

sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8

sourceSets {
generated {
Expand All @@ -32,9 +18,49 @@ Properties properties = new Properties()
properties.load(project.rootProject.file('local.properties').newDataInputStream())
def toolJarDir = properties.getProperty('tooljar.dir')

publishing {
publications {
mavenJava(MavenPublication) {
groupId = project.groupProjectID
artifactId = 'compiler'
version = project.publishVersion
from components.java

pom {
name = project.projectName
description = 'Compiler package for Bunch'
url = 'https://github.com/tompee26/Bunch'
licenses {
license {
name = 'MIT License'
url = 'https://github.com/tompee26/Bunch/blob/master/LICENSE.md'
}
}
developers {
developer {
id = 'tompee26'
name = 'tompee'
email = 'tompee26@gmail.com'
}
}
}
}
}
repositories {
maven {
name = "GithubPackages"
url = uri("https://maven.pkg.github.com/tompee26/Bunch")
credentials {
username = "tompee26"
password = properties.getProperty("token")
}
}
}
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation project(':annotation')
implementation files("${toolJarDir}/lib/tools.jar")

Expand All @@ -45,7 +71,7 @@ dependencies {
compileOnly "net.ltgt.gradle.incap:incap:$incap"
kapt "net.ltgt.gradle.incap:incap-processor:$incap"

def kotlinPoet = "1.4.4"
def kotlinPoet = "1.5.0"
implementation "com.squareup:kotlinpoet:$kotlinPoet"
implementation "com.squareup:kotlinpoet-metadata:$kotlinPoet"
implementation "com.squareup:kotlinpoet-metadata-specs:$kotlinPoet"
Expand Down

0 comments on commit 5658530

Please sign in to comment.